You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Chris Herron <ch...@gmail.com> on 2009/04/16 23:44:35 UTC
"Zombie" files repeatedly updated when merging between branch and
trunk
Hi,
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.
Steps in more detail:
1. Create a branch from head of trunk.
2. Modify one file (say foo/example.txt) on branch working copy,
commit that file only.
3. Within root of trunk working copy:
run: svn merge --reintegrate branch-url
output:
--- Merging differences between repository URLs into '.':
U bar/zombie1.txt
U bar/zombie2.txt
U bar/zombie3.txt
U bar/zombie4.txt
U bar/zombie5.txt
U bar/zombie6.txt
U bar/zombie7.txt
U bar/subdir/zombie8.txt
U bar/subdir/zombie9.txt
U bar
U foo/example.txt
U .
4. Commit these updates to trunk.
Prior to step 4, observing the diffs, there are no material changes to
the files themselves - they are identical to their latest revisions on
the trunk (except for foo/example.txt, which was expected).
Comparing the svn:merginfo between the working copies and trunk, all
of the zombie files, and the "bar" directory gain the branch and its
corresponding revisions, while foo/example.txt does not.
This re-occurs with every merge, even on new branches. Note that these
aren't the only files under directory "bar" - but *only* these files
keep reappearing as updates.
Any suggestions as to what might be causing this, and how I might
correct it?
Cheers,
Chris.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1757078
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: "Zombie" files repeatedly updated when merging between branch
and trunk
Posted by Tyler Roscoe <ty...@cryptio.net>.
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
Re: "Zombie" files repeatedly updated when merging between branch
and trunk
Posted by Chris Herron <ch...@gmail.com>.
Nick,
I was reluctant to manually edit the mergeinfo. Despite the advice
from other users, it seemed a bit risky. It is discouraged unless you
really know what you're doing.
In the end I did the following which seemed to help with my issue:
* Upgraded my svn clients (IDE and command line) to 1.5.6
* Deleted all my local working copies, and checked them out again
using updated client
I was able to run through the scenario described in my first post, and
after these changes, only the file "foo/example.txt" was updated in
the merge - which is the expected behavior.
Chris.
On Apr 20, 2009, at 4:42 AM, Nicholas Curry wrote:
> 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@gmail.com]
> Sent: 17 April 2009 15:41
> To: users@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
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1825801
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: "Zombie" files repeatedly updated when merging between branch
and trunk
Posted by Nicholas Curry <Ni...@cofunds.co.uk>.
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@gmail.com]
Sent: 17 April 2009 15:41
To: users@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@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@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@subversion.tigris.org].
Re: "Zombie" files repeatedly updated when merging between branch
and trunk
Posted by Chris Herron <ch...@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 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@subversion.tigris.org].
RE: "Zombie" files repeatedly updated when merging between branch
and trunk
Posted by Bob Archer <bo...@amsi.com>.
> 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=1768287
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].