Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: "Zombie" files repeatedly updated when merging between branch and trunk

subversion
Discussion topic

Back to topic list

Re: "Zombie" files repeatedly updated when merging between branch and trunk

Author Chris Herron <cherro at gmail dot com>
Full name Chris Herron <cherro at gmail dot com>
Date 2009-04-17 07:41:13 PDT
Message 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
Attachments

« Previous message in topic | 3 of 6 | Next message in topic »

Messages

Show all messages in topic

"Zombie" files repeatedly updated when merging between branch and trunk Chris Herron <cherro at gmail dot com> Chris Herron <cherro at gmail dot com> 2009-04-16 16:44:39 PDT
     RE: "Zombie" files repeatedly updated when merging between branch and trunk pilotbob Bob Archer 2009-04-17 07:01:30 PDT
         Re: "Zombie" files repeatedly updated when merging between branch and trunk Chris Herron <cherro at gmail dot com> Chris Herron <cherro at gmail dot com> 2009-04-17 07:41:13 PDT
             Re: "Zombie" files repeatedly updated when merging between branch and trunk tylermr Tyler Roscoe 2009-04-17 08:14:07 PDT
             RE: "Zombie" files repeatedly updated when merging between branch and trunk "Nicholas Curry" <Nicholas dot Curry at cofunds dot co dot uk> "Nicholas Curry" <Nicholas dot Curry at cofunds dot co dot uk> 2009-04-20 01:42:23 PDT
                 Re: "Zombie" files repeatedly updated when merging between branch and trunk Chris Herron <cherro at gmail dot com> Chris Herron <cherro at gmail dot com> 2009-04-20 07:43:24 PDT
Messages per page: