[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: Bob Archer <bob.archer_at_amsi.com>
Date: Sun, 19 Apr 2009 13:23:41 -0400

> 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
> email in front of you so you could give me some good search term?

No sorry. Check the release notes for the 1.5.5 versions. There were
several fixes to this issue. Sounds like some still remain.

Perhaps it is because those files already have mergeinfo on them that
they are being updated during the merge. You may wish to try removing
the mergeinfo on all those files and see it that might help.

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

I agree. I would say post a message on the svn list. They really need to
resolve this. Although it is only annoying and doesn't really cause and
issues. You can just revert those files that you know are unchanged.

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

Perhaps this has something to do with it. I haven't seen anyone mention
this information before. Once again, be sure to share this on the svn
list. They also might want you to create a "recipe" that duplicates it.
Basically a batch file that does all the commands which illustrate the

Sorry I can't be of more help.



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

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