[Zope-Coders] checking in on a branch?

[Brian Lloyd]

> So... what should I do next?
> 
> Officially, I guess I should back out the change from the Trunk, and 
> stick it back in the branch where it should be.
> 
> Pragmatically, it is a tiny tiny isolated bugfix, so I could check the 
> same fix into the release branch, and amend CHANGES.txt.
> 
> 
> I think the latter is better. Can I get an "ok" from someone at ZC?

Ok :)


> How would I go about backing out a change anyway?

It's not easy or fun - a good CVS book is probably the best resource 
there :) You basically would need to manually revert all of the files
you changed to the version before the change.

For big changes, it can be a good idea to tag the head or branch that
you are merging _into_ before attempting the merge (brian-pre_oops_tag).

That way in the worst case, you can check out a sandbox based on your 
oops tag and diff files with the screwed files (in another sandbox).

Luckily, we've been able to coordinate a fairly large number of people 
in various parts of the world for some time now without having had to 
do a major painful backout. :)



Brian Lloyd        brian@zope.com
Software Engineer  540.361.1716              
Zope Corporation   http://www.zope.com