[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: Dennis Jones <djones_at_grassvalleysoftware.com>
Date: Thu, 28 Apr 2011 15:36:38 -0700

"Wayne Johnson" <wayne_at_zk.com> wrote in message
news:1CD929669C395E4784413565DDEE1BFA7B0F6F_at_prima.ZK.local...

>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.
>
>There must be something like this going on (whether or not you are using
>svnmerge or getting a conflict.) I believe that both svnmerge and svn's
>native merge support use properties to keep track of what has been
>merged to where.

Okay Wayne, so how do I figure out what the cause is and fix it?

- Dennis

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-29 00:36:52 CEST

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