[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Kylo Ginsberg <kylo.ginsberg_at_gmail.com>
Date: 2007-03-22 16:24:29 CET

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 \
> 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 \


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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.