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

RE: Every merge suggest changes to same files

From: nitramk <martin_at_hmailserver.com>
Date: Sun, 19 Apr 2009 09:52:50 -0700 (PDT)

Bob Archer wrote:
>
>> Expected behavior:
>> When I commit, In the changes made dialog, I would expect only the
>> somefile.txt file to be shown. I haven't made any changes to the other
>> files
>> listed, so I don't understand why they are shown.
>>
>> Can someone explain this behavior to me?
>>
>> Martin
>
> If you look at those files you will probably see the merge properties
> were added. It shouldn't happen. Although from reading the svn mail list
> it is supposed to be fixed as of 1.5.5. What version of TSVN are you
> using? What version is your server? Does the same thing happen if you
> run the merge from the svn CLI?
>
> BOb
>

I've never used the svn CLI before but when I test it now I see the same
behavior. So it's not a TSVN issue. Using the terms svn mergeinfo on Google,
I was now able to find some other posts with the same problem, but I didn't
see any answers explaining it or saying where it's fixed. Do you have the
email in front of you so you could give me some good search term?

And to answer your questions (which I assume is kind of irrelevant now since
it's a SVN issue and not a TSVN issue):

It's correct that the files and folders which are shown has mergeinfo.

Previously I was using SVN client 1.5.1. Unfortunately I don't know what
server version I was on (probably 1.5.0 since I haven't touched in a while).
I upgraded to SVN server 1.6.1 and TortoiseSVN 1.6.1. In that version of
TSVN, SVN 1.6.1 seems to be included. However, after the upgrade I see the
exact same behavior as before. Both when using the TSVN user interface and
SVN.

Trying to resolve the issue, I made some changes to a problematic file on
/branches and merged that into trunk, hoping that I would reset some
incorrect state somewhere, but this did not solve the problem. The file
stills turns up as modified after a merge.

All the files I'm having the problem with has been renamed some time in
history. I don't do renames often, but I remember that these specific files
have been renamed at one point.

-- 
View this message in context: http://www.nabble.com/Every-merge-suggest-changes-to-same-files-tp23123496p23124955.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1809195
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-19 19:05:52 CEST

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