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

RE: conflict on merge?

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Sun, 11 Jan 2009 00:26:48 +0100

> -----Original Message-----
> From: sussman_at_gmail.com [mailto:sussman_at_gmail.com] On Behalf Of Ben
> Collins-Sussman
> Sent: Saturday, January 10, 2009 9:40 PM
> To: dev_at_subversion.tigris.org
> Subject: conflict on merge?
>
> I've been updating my feature branch every couple of weeks: 'svn up;
> svn merge ^/trunk'. No problems.
>
> Yesterday I tried this, and got a bizarre svn:mergeinfo conflict:
>
> Conflict for property 'svn:mergeinfo' discovered on
> 'tools/buildbot/slaves/ubuntu-x64'.
> They want to delete the property, you want to change the value to
> '/branches/1.5.x-r30215/tools/buildbot/slaves/i686-debian-sarge1:30238
> ...
> (dozens of lines of property value)
> ...
>
> Is this conflict something I should accept?

The (probably empty) merge information on this file was removed on trunk,
but on your branch its value changed by merging other changes to the branch.
I think you can safely remove the merge information on this directory in
your branch and mark the conflict as resolved.

(On trunk the property was removed in r35035 after discussion in
http://svn.haxx.se/dev/archive-2008-11/0532.shtml).

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1016000
Received on 2009-01-11 09:04:08 CET

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