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

Re: duplicate merge conflict

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 21 Apr 2011 14:56:39 +0200

On Wed, Apr 20, 2011 at 04:32:54PM -0400, Bob Archer wrote:
> > 2. I just tried the above command and it started trying to merge
> > things from
> > months ago together. Is there any way to tell SVN what it should
> > use as a
> > baseline for automatic merges? I tried tried just letting it
> > finish and
> > then replacing all of the source files and doing a commit, but this
> > didn't
> > seem to have any effect. Issuing the command again gave the same
> > results.
> > I also tried --record-only which did the full merge anyway.
> Record only should only make changes to the properties and not the files. You can also just manually update the svn:merginfo on the trunk if you want.

I think the problem is that because Daniel is using ancestrally
unrelated trees for the left and right side of his merge diff there
is no merge-tracking (just like when the --ignore-ancestry option is used).
So any options related to merge-tracking (like --record-only) have no effect.
Received on 2011-04-21 15:02:31 CEST

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.