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

Re: Mergeinfo

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Thu, 28 May 2009 12:52:58 -0700

Plaatje, Patrick wrote:
> So why do these two files (and not the 1000 others) keep popping up there?

Because those files already have mergeinfo. Once a file (or folder) has
mergeinfo on it, it must be updated every time you merge. That's just
how the system works.

Your options are:
1. Accept that this is going to happen every time.
2. Delete the svn:mergeinfo property from those files. I'd recommend to
first compare the mergeinfo on the files to that of the root directory;
then if you genuinely don't care about the differences, it's fine to
delete the mergeinfo from the files.

-Mike

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2356560

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-28 21:54:14 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.