Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: Surprising merge results - Mergeinfo Elision?

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: Surprising merge results - Mergeinfo Elision?

Author gdt
Full name Greg Troxel
Date 2009-11-04 05:12:31 PST
Message David Aldrich <david.aldrich@eu​.nec.com> writes:

[mail formatting repaired - lines should be <80 characters]

> I am using a GUI svn client based on SVNkit 1.3.1, which I believe is
> aligned with svn 1.6.5 approx, and svn server 1.5.2.
>
> I have just merged changes from my project's trunk into my branch and
> am surprised to see that I have 100 files showing a local state of
> 'Modified (properties only)'. If I examine the changes I find that the
> only change on each of these files is that the svn:mergeinfo property
> has been removed.

I suspect this is the client cleaning up redundant subtree mergeinfo.
Ask yourself if the effective mergeinfo for those files matches before
and after the removal.
Attachments
attachment-2770455

« Previous message in topic | 2 of 4 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
Surprising merge results - Mergeinfo Elision? davida David Aldrich 2009-11-04 01:13:17 PST
     Re: Surprising merge results - Mergeinfo Elision? gdt Greg Troxel 2009-11-04 05:12:31 PST
         RE: Surprising merge results - Mergeinfo Elision? davida David Aldrich 2009-11-04 05:36:11 PST
             RE: Surprising merge results - Mergeinfo Elision? "Jeremy Mordkoff" <jlm at ZeeVee dot Com> "Jeremy Mordkoff" <jlm at ZeeVee dot Com> 2009-11-04 06:21:45 PST
Messages per page: