Damn... I think I might have just muffed a checkin
I just updated httplib.py to expand the list of names in its __all__ list. I was operating on version 1.34. After the checkin I am looking at version 1.34.2.1. I see that Lib/CVS/Tag exists in my directory tree and says "release21-maint". Did I muff it? If so, how should I do an unmuff operation? Skip
Skip Montanaro writes:
I just updated httplib.py to expand the list of names in its __all__ list. I was operating on version 1.34. After the checkin I am looking at version 1.34.2.1. I see that Lib/CVS/Tag exists in my directory tree and says "release21-maint". Did I muff it? If so, how should I do an unmuff operation?
If that's really a muff, revert the change: cd .../Lib/ cvs diff -r1.34.2.1 -r1.34 httplib.py | patch and commit the new version as 1.34.2.2: cvs commit -m 'unmuff...' httplib.py -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Digital Creations
>> I just updated httplib.py to expand the list of names in its __all__ >> list. I was operating on version 1.34. After the checkin I am >> looking at version 1.34.2.1. I see that Lib/CVS/Tag exists in my >> directory tree and says "release21-maint". Did I muff it? If so, >> how should I do an unmuff operation? Fred> If that's really a muff, revert the change: Fred> cd .../Lib/ Fred> cvs diff -r1.34.2.1 -r1.34 httplib.py | patch Fred> and commit the new version as 1.34.2.2: Fred> cvs commit -m 'unmuff...' httplib.py Functionally, the checkin isn't a muff (it does have the change I intended), but I was worried about the version number. Should I have checked it in as version 1.34.2.1 or 1.35? Skip
Skip Montanaro writes:
Functionally, the checkin isn't a muff (it does have the change I intended), but I was worried about the version number. Should I have checked it in as version 1.34.2.1 or 1.35?
If the change should happen on the branch, leave it in. If it's also needed on the HEAD, check it in again there, and you're done. -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Digital Creations
On Thu, May 31, 2001 at 01:06:01PM -0500, Skip Montanaro wrote:
I just updated httplib.py to expand the list of names in its __all__ list. I was operating on version 1.34. After the checkin I am looking at version 1.34.2.1. I see that Lib/CVS/Tag exists in my directory tree and says "release21-maint". Did I muff it? If so, how should I do an unmuff operation?
You had a sticky tag on the file, probably because you used
'-rrelease21-maint' on a cvs checkout or update. Good thing it was
release21-maint, though, and not some random other revision, or you would
have created another branch :-)
You can remove stickyness by using 'cvs update -A'. I personally just have
two trees, ~/python/python-2.2 and ~/python/python-2.1.1, where the last one
was checked out with -rrelease21-maint.
--
Thomas Wouters
"TW" == Thomas Wouters
writes:
TW> You can remove stickyness by using 'cvs update -A'. I TW> personally just have two trees, ~/python/python-2.2 and TW> ~/python/python-2.1.1, where the last one was checked out with TW> -rrelease21-maint. Very good advice for anybody playing with branches! -Barry
Thomas> I personally just have two trees, ~/python/python-2.2 and Thomas> ~/python/python-2.1.1, where the last one was checked out with Thomas> -rrelease21-maint. Thanks, good advice. httplib.py has now been updated on both the head and release21-maint branches. Skip
participants (4)
-
barry@digicool.com
-
Fred L. Drake, Jr.
-
Skip Montanaro
-
Thomas Wouters