RE: "Zombie" files repeatedly updated when merging between branch and trunk
From: Nicholas Curry <Nicholas.Curry_at_cofunds.co.uk>
Date: Mon, 20 Apr 2009 09:42:12 +0100
Hi Chris,
Did you ever get an answer to this? I’m looking at doing something similar, and it would be great to know how safe that is.
Thanks,
Nick
From: Chris Herron [mailto:cherro_at_gmail.com]
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 arent 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
********************************************************
This e-mail has been swept for viruses by Cofunds.
For more information on this service, please
contact the IT Service Desk on Ext: 7060 or itservicedesk_at_cofunds.co.uk.
********************************************************
Cofunds Limited, 1st Floor, 1 Minster Court, Mincing Lane,
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org]. |
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.