On Wed, Aug 06, 2008 at 05:53:53PM -0400, Paul Burba wrote:
> On Wed, Aug 6, 2008 at 7:29 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> > On Tue, 2008-08-05 at 15:57 +0100, Julian Foad wrote:
> >> On Fri, 2008-07-25 at 12:52 +0100, Julian Foad wrote:
> >> > On Thu, 2008-07-24 at 11:57 -0400, Paul Burba wrote:
> >> > > Now we try the reverse merge, and as in < 1.5 the files scheduled for
> >> > > addition are skipped:
> >> > >
> >> > > 1.5.1>svn.exe merge -r3:2 %URL%/branches/mybranch
> >> > > Skipped 'newfile1'
> >> > > Skipped 'newfile2'
> >> > > Skipped 'newfile3'
> >> >
> >> > A good enhancement will be to compare the locally-added file with the
> >> > one that the incoming change thinks it's deleting (i.e. the merge-left
> >> > source), and only skip if they're different. That check is something
> >> > we're doing for tree conflict detection anyway, but can be done
> >> > independently.
> > Here's an improved version. It now compares the properties as well as
> > the text content. It ignores the "svn:mergeinfo" property because that
> > property does not contribute to a difference in the file's current state
> > but only tells how the file reached its current state.
The svn:executable, svn:mime-type and svn:eol-style should not matter as
well. This file is not changed just because it differs in these
properties. I often change these in one branch but forget it in another
one (and merging is not always possible if the branches diverged a lot).
If the content is equal but other (non-trivial) properties are not, it
is a good idea to keep the properties as proposed. But would it be OK to
change the file to an empty one (the content matched the to be removed
file, we are in trouble because of the properties only)? Maybe also
changing the file content into:
<<<<<<<<
========
Subversion note: This file was indented to be removed but
the properties didn't match. That's why it still exists with
this pseudo conflict in it but with removed content.
>>>>>>>>
Jens
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-07 14:16:00 CEST