[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: Thomas Lehmann <t.lehmann_at_rtsgroup.net>
Date: Tue, 19 May 2009 00:24:33 -0700 (PDT)

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.

Heiko Tappe schrieb:
> Nobody? Shall I ask in a subversion forum?
>
> --Heiko
> I am not sure this is a tortoise or more a subversion question.
>
> I plan to switch our repo to version 1.5, so I did so for a test repo. As client I used TortoiseSvn 1.6.2.
> I wanted to test the merge history feature. So I changed a file in trunk.
> I then went to the log of trunk messages (root dir of trunk), selected the revision of the last change and
> merged it into a branch (root dir of that branch).
> I was then quite astonished to see loads of changed files/dirs when I wanted to commit the changes of the branch.
> Even directories and files that don't seem to be related to the change got mergeinfo-properties. But on the other hand
> not all items got the mergeinfo property.
> Can anybody explain to me what's going on here?
>
> --Heiko
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2307650
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

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

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

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