Re: unexpected conflict merging branch into trunk (after merging trunk into branch)

On 3/22/07, Darin Kelkhoff <dkelkhoff@materialogic.com> wrote:
> ## Finally, I went back to trunk, to merge the branch back into it:
> training/trunk> svn merge -r 223:227 \
                     svn+ssh://mldev/TRAINING/branches/test_merge
> C myNewFile

I think you're mis-specifying the first source revision. E.g. note
that your "left" conflict is pointed at r0, i.e. when the file didn't
exist. So you're asking the merge to apply as difference a line which
was already in the trunk file. Hence the conflict.

What if you try specifying the first source revision as the state of
the branch prior to the edits of interest:
training/trunk> svn merge -r 226:227 \
                     svn+ssh://mldev/TRAINING/branches/test_merge

Cheers,
Kylo

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 22 16:24:57 2007