[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Merge deleting a file - compare its content [was: Merge and reverse merge dont seem to cancel out]

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 05 Aug 2008 15:57:02 +0100

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.
> I'll have a go at a patch to make this happen. (It so happens that this
> is what I am about to work on for tree conflicts anyway.) I haven't
> missed any reason why we'd not want to change this, have I?

Here we go.

Can anyone take a look at the attached patch and comment on the places
I've flagged with "###" and generally on whether it's going the right

Much appreciated...
- Julian

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-05 16:57:30 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.