kfogel@collab.net wrote:
>"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?
>
>
I suppose if I'm doing the merge and the change is already there it
should simply do nothing. For example, when I merged from trunk back
into branch, I effectively merged my changes with mine same changes, and
SVN didn't complain as it shouldn't have. Why would I have to
/selectively/ do it if I can do it all at once? Or can I? Thanks!
Sergey.
Received on Wed Aug 13 00:34:08 2003