[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: Tyler Roscoe <tyler_at_cryptio.net>
Date: Fri, 17 Apr 2009 08:14:07 -0700

On Fri, Apr 17, 2009 at 10:41:09AM -0400, Chris Herron wrote:
> 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?

If you aren't interested in the independent mergeinfo for the "zombie"
files (like if you always do merges from the root of the branch), I
believe it is safe to just delete the svn:mergeinfo property from those
files.

tyler
Received on 2009-04-17 17:15:26 CEST

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