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_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
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1825801
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-20 16:46:14 CEST