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

Re: Repeated merges problem

From: Felix Saphir <felix.saphir_at_kantarmedia.de>
Date: Fri, 29 Apr 2011 07:10:06 +0200

Am 29.04.2011 00:36, schrieb Dennis Jones:
> "Wayne Johnson"<wayne_at_zk.com> wrote in message
>
>> I have seen this problem when using svnmerge.(py/exe). What happens is
>> after running svnmerge I end up with a conflict on the properties of the
>> root folder (the merge info that was updated.) If you don't handle this
>> confict properly the merge info does not get committed so svnmerge does
>> not remember that these revisions have already been merged.
>
> Okay Wayne, so how do I figure out what the cause is and fix it?

Each merge should be recorded in the property svn:mergeinfo of the
top-most destination folder. You can easily check the current value with
TortoiseSVN, just select "Properties" from the submenu. You should see
something like "svn:mergeinfo /trunk:883-1152,1165-1437,1439", which
means that all those revisions from trunk were merged.

Does "check for modifications" show changed properties after a merge?
Does svn:mergeinfo contain the revisions you just merged?

Felix

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2725608

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-29 07:10:21 CEST

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