Re: re-creating patch branch

[Larry Jones]

Tim Velten writes:
> 
> We recently had a production release that was developed on a branch we'll 
> call "aug07_branch".   After the release was successfully deployed the 
> aug07_branch was merged into the trunk.  The trunk was then tagged 
> "trunk_aug07_postrelease"  Then a patch branch named "aug07_patch_branch" 
> was created based on the tag "trunk_aug07_postrelease".  So far so good.
> 
> Then it was discovered that some files from the merge were messed up.  So 
> the files were fixed and committed to the trunk.  The trunk was then 
> tagged again with tag "trunk_aug07_postrelease_2". 
> 
> So the question is - how do we get the patch branch updated with the new 
> changes to the trunk ?
> 
> I think I can just recreate the patch branch using the new tag 
> "trunk_aug07_postrelease_2" and the -F and -B options.  Can anyone confirm 
> this ?  It was not obvious from the documentation.

That just moves the branch tag, it doesn't do any merging.  As long as
there haven't been any changes checked in to the patch branch yet,
that's sufficient.

> Would it be better to merge the changes between the 2 trunk tags into the 
> branch ?

If there have been any changes checked in on the patch branch, you need
to do that.  Or create a new patch branch off the new trunk tag and
merge the changes from the old patch branch into the new patch branch.

-Larry Jones

I can do that!  It's a free country!  I've got my rights! -- Calvin