"Sergey A. Lipnevich" <sergey@optimaltec.com> writes:
> Oh, /now/ I'm beginning to understand. So, when I delete the branch
> and copy over the trunk, I have to merge into this same branch using
> -r
> <revision that started the "old" branch>:<revision before creation of
> the "new" branch>. I think this time I got it.
Not quite. The choice of start and end revision will depend on what
changes you're trying to port from the new branch to the old one. It
should include only changes that were never ported to trunk, since
those are therefore also not present in the new branch. Whether you
want all of those changes, or just some, or what, will depend on their
semantics. You may even need to do multiple merges, using different,
disjoint revision ranges...
Does it become clearer now?
> Thanks for your
> patience! You and the entire Subversion team continue to amaze me, I
> think many OSS and proprietory projects would benefit if they use
> Subversion as a case study.
:-) No need to thank us -- we thank you for doing all this work!
But note that the branching techniques I'm describing here aren't
really Subversion-specific. I have used them (somewhat more
painfully) in CVS, and I'm pretty sure others have used them in other
systems.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 13 00:00:42 2003