[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: Wayne Johnson <wayne_at_zk.com>
Date: Wed, 4 May 2011 16:40:16 -0700

> -----Original Message-----
> From: Dennis Jones [mailto:djones_at_grassvalleysoftware.com]
> Sent: Tuesday, May 03, 2011 7:09 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: Repeated merges problem
>
> "Dennis Jones" <djones_at_grassvalleysoftware.com>
> wrote in message news:ipcomh$947$1_at_dough.gmane.org...
>
> > How can I clean up my repository so that these files/folders don't
> keep
> > wanting to be merged all the time?
>
> This conversation seems to have stalled. Any other ideas on this?
>
> Supposing that I don't care about losing the merge info, can I just
> clear
> the merge properties the files/folders that are having a problem?
Will
> that
> allow me to do a one-time merge that will clean everything up?
>
> - Dennis
>

You should be able to track down the problem with the information we
have supplied. The bottom line is that SVN 'remembers' what has been
merged using properties, 'svn:mergeinfo'. The value of this property is
a path in the repository and a list of revisions already merged from the
listed path to the current path. Here's an example I made up (so it may
not be 100% correct but should be close enough for you to figure out
what you're looking at.)

svn:mergeinfo '/branches/featurea:100,105-107'

Say this is the property a trunk working copy. This tells you that
Subversion has merged revisions 100, 105, 106, and 107 from the featurea
branch to the trunk.

You need to look at the svn:mergeinfo stored in your working copy and
match that with the files, folders and revisions you are having problems
with and make sure that the svn:mergeinfo includes information about
those revisions. My guess is that this information is missing. If it is
not then I don't know what the problem is.

Also, I would expect this property to appear only in the root of your
project directory structure. I am sure there are reasons to do it
otherwise but I would not expect that in general. In other words you
should know what you are doing in that case.

Wayne

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-05 01:40:20 CEST

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