[Zope-Checkins] Checkin blunders

[seb bacon]

Thanks for the pointers, though I've actually learned those particular 
lessons long ago.  It's more a problem of keeping track of which branch 
I'm in at any given moment.  In this case, the error came from working 
from a single sandbox and getting my sticky tags wrong when checking in 
changes to both the release branch and the HEAD.

The lesson there is to keep separate sandboxes per branch.

I would also have got into less of a tangle had I created a branch 
specifically for the bugfix.

seb


Guido van Rossum wrote:
>>Log Message:
>> - undo silly mistakes (DateTime regression; messing up CHANGES.txt)
> 
> 
> I see this kind of mistake a lot.  Some tips on avoiding checkin
> blunders:
> 
> - You can do "cvs commit" on one or more individual files; this is
>   more efficient than doing cvs commit on the whole tree, and also
>   avoids accidentally checkin in temporary changes in unrelated parts
>   of the tree
> 
> - Use "cvs diff" before checking in, and skim the diffs.  Some people
>   get in the habit of waiting for the post-commit diffs to arrive in
>   email, but it's better to be ahead of the game.
> 
> - If you're using Emacs, there are two different Emacs packages that
>   help tremendously with CVS.  One (vc-mode) is what I use myself; it
>   only supports actions on individual files; another (pcl-cvs) works
>   in a different way which some folks like better, and it supports
>   actions on multiple files.
> 
> --Guido van Rossum (home page: http://www.python.org/~guido/)

-- 

    [] j a m k i t

         seb bacon
T:  020 7549 0520
F:  020 7490 1152
M:  07968 301 336
W: www.jamkit.com