[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: 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]
Sent: 17 April 2009 15:41
To: users_at_subversion.tigris.org
Subject: Re: "Zombie" files repeatedly updated when merging between branch and trunk

 

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,
London EC3R 7AA. Registered in England and Wales
No 3965289. Authorised and regulated by Financial Services Authority. Phone: 0845 604 4001, or visit our website at www.cofunds.co.uk.
Telephone calls may be recorded for monitoring purposes.
**************************************************************************
The information contained in this message may be CONFIDENTIAL and is intended for the addressee only. Any unauthorised use, dissemination of the information, or copying of this message is prohibited. If you are not the addressee, or believe this email to have been sent in error, please notify security_at_cofunds.co.uk immediately and delete this message.
Although this e-mail and any attachments are believed to be free of any virus, or other defect which might affect any computer or system into which they are received and opened, it is the responsibility of the recipient to ensure that they are virus free and no responsibility is accepted by Cofunds for any loss or damage from receipt or use thereof.
This email does not create or vary any contractual obligations between Cofunds Limited and the addressee. Any views or opinions are solely those of the author and do not necessarily represent those of Cofunds Limited.
Those communicating with us by electronic mail will be deemed to have accepted the risks associated with interception, amendment, loss and late or incomplete delivery. They will also be deemed to have consented to our monitoring of such communications.
**************************************************************************

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-20 10:43:18 CEST

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