[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: Daniel Walter <d2walter_at_hotmail.com>
Date: Thu, 21 Apr 2011 11:06:13 -0400

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

I think that what I am dealing with is ancestrally related now:

(in 4.2 working copy) svn merge --record-only -r 222:473

Here I am attempting to generate merge info for the changes since I started
the branch at r222 up to the point where I figured out everything I have
been doing wrong r473.

It seems like --record-only should generate an error if there is a problem
instead of corrupting my working copy. It is a simple matter to revert
this, but it is not very useful for understanding what I did wrong.

I wanted to check my version numbers, to make sure that I am using recent
versions. My client is 1.6.13. Is there a way to get the server version
from the svn client?
Received on 2011-04-21 17:06:46 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.