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

conflict on merge?

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: Sat, 10 Jan 2009 14:39:43 -0600

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?
Received on 2009-01-10 21:40:08 CET

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