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

Re: Unexpected mergeinfo properties

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Tue, 19 May 2009 10:23:44 -0700

Thomas Lehmann wrote:
> Hello Heiko,
>
> I have been also asking some months ago and I have been told
> that this is an subversion problem and we have to wait for next
> subversion version. I remember TortoiseSVN somewhere around
> 1.5.3 (+/- 0.0.1) there the problem has not been present. Since
> next version then NOTHING has changed to solve this problem. I can
> do a merge and when committing I get a big mass of unrelated
> changed in properties (merge tracking).
>
> The only solution I know to get with this is to sort by text
> modifications
> selecting those entries only. After the commit I have to do a revert
> of the checkout to get rid of the other stuff. Would be fine if the
> TortoiseSVN
> guys could tell a little about the problem also they are providing a
> front "only".
>
> Also an important hint is to reduce the selection. Don't use the root
> to merge
> and commit when it's possible to use a folder somewhere in the depth.
> This
> reduced the amount of unrelated files and folder notedly.

This is a subversion issue; it's not restricted to TSVN, and so this
isn't really the place to get answers about it. This topic has been
covered many times on the subversion users mailing list, so I'm not
surprised there haven't been more responses to this thread.

Still -
Most of the excessive mergeinfo is only created when using svn
1.5.0-1.5.5, and it happens any time you do a repo-to-repo copy. (This
naturally also happens if you rename or move a file, since those
operations are performed with a copy+delete.)

1.5.6 and later (including 1.6.x) don't generate as much new
mergeinfo. However, this does nothing for the mergeinfo that you have
already committed to your repository. This is why you're still seeing
mergeinfo changing when you go to commit a merge; all of the existing
mergeinfo properties have to be updated, even if no new ones are being
created.

If you revert the mergeinfo changes instead of committing them, then the
stored information about merging will be wrong. This means that anything
that relies on the mergeinfo will be relying on wrong information and
may do the wrong thing.

Paul Burba wrote an excellent in-depth article about mergeinfo if you
want to better understand what's going on. You can find that here:
http://www.collab.net/community/subversion/articles/merge-info.html

-Mike

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-19 19:25:05 CEST

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