Re: svn commit: rev 6715 - in branches/neon-0.24

At 3:22 PM -0400 8/19/03, Sergey A. Lipnevich wrote:
>Let's say I create a branch by rev r16, then commit two revisions on
>branch, r17 and r18, and merge r17 into trunk by revision r32, and
>then "rebranch:" delete the branch (r33) and copy the trunk over
>(r34). The change r18 is left out in the "old" branch. Now, I go to
>a branch root and do a merge of r16:32, because I do not want to dig
>out what exactly changes have been left out after merging with trunk
>and rebranching. This merge is going to give me r17 changes back,
>now on the new branch, that's for sure. But, is this merge going to
>create any conflicts, and if yes, why? Is r17 going to introduce a
>conflict "with itself?"

No. The algorithm is text-based, and the text is identical, so the
merge doesn't have any trouble.

Now, if you want to clutter up your example with some
not-quite-identical text (which is easy enough to do in real life), I
might give a different answer! But it would be the answer you
expect, now that I've said "text-based."

-- 
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org