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

RE: Merge causing modified flag on every new commit

From: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 15 Oct 2009 10:21:03 -0400

> same issue here. Very annoying. For instance, I merge one file from
> trunk to branch. When committing, Tortoise offers 13 files to commit,
> always the same files. I tried to commit all of them, or to revert all
> of them. Next merge the issue occurs again.

Once a file has mergeinfo on it svn will always update it. There must be mergeinfo on those files that is not applied to the folder where you are doing the merge. If it were the mergeinfo on the files would be elided (removed).

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-15 16:21:15 CEST

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