Re: Question regarding merging branches

"Dylan Cuthbert" <dylan@q-games.com> writes:

> I svn copy'd a branch
> I then edited file "A" in that branch, changing the top line to read "clash
> test"
> I then committed
> I then edited the "A" file in the trunk, changing the top line to read
> "conflict central"
> I then committed
> I then edited the "A" file in the branch, changing line 20 or so to read
> "non-conflicting merge"
> I then committed
>
> I am now trying to merge the branch back into the trunk, it is merging
> "non-conflicting merge", but file "A"'s first line reads "conflict central".
> In my mind I should get a conflict or the branches' changes are being
> selectively ignored.
>
> What am I not "getting"?

Here's what you're not getting: a "conflict" is defined to be a clash
between
  
   1. a patch that the server is trying to apply to a file

   2. a local mod that you have made to the file.

In your examples, you have *no* local mods when you run 'svn merge', so
you will never ever see a conflict. The patch from the server will
always be applied cleanly.

Conflicts happen only when there's risk of permanently losing changes;
but because you commit everything, that risk is gone.

To get a conflict, try changing the first line to something new,
*don't* commit, and run 'svn merge' from the branch to the trunk.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 9 13:57:33 2002