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

Re: "Zombie" files repeatedly updated when merging between branch and trunk

From: Chris Herron <cherro_at_gmail.com>
Date: Fri, 17 Apr 2009 10:41:09 -0400

Hi Bob,

The branch mentioned in my first email was created using a 1.5.4
client (IntelliJ 8 (EAP 9805) which uses SVNKit 1.2.1). The merge was
performed using a 1.5.5 client (Mac OS X subversion command line).

Is it possible to prevent this occurring again by manually altering
the svn:mergeinfo properties for the affected files? Or is there a
better/safer way?

Thanks,

Chris.

On Apr 17, 2009, at 10:01 AM, Bob Archer wrote:

> > I have an irritating recurring issue when I merge from a branch to
> trunk. The same 9 files, plus their parent directory, keep getting
> updated, even when those files have not been modified (neither on
> branch nor trunk). We're using Subversion 1.5.
>
> Are you using 1.5.5 ??? The files aren’t being changed by
> mergeproperties are being put on them. Eariler version of 1.5 did
> this… It was mostly cleaned up by 1.5.5… although I have still seen
> reports of people getting phantom and unneeded mergeproperties even
> with 1.5.5
>
> BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-17 16:42:05 CEST

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