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

Re: [PATCH] Merge deleting a file - compare its content

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 08 Aug 2008 11:53:25 +0100

On Thu, 2008-08-07 at 19:47 -0400, Paul Burba wrote:
> On Thu, Aug 7, 2008 at 7:34 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> > On Wed, 2008-08-06 at 17:53 -0400, Paul Burba wrote:
> >> I'm playing around with some tweaks to filter_merged_revisions() and
> >> prepare_subtree_ranges()'s behaviors in case F (and maybe it's forward
> >> merge equivalent described in case A) to see if your patch and the
> >> issue #3067 fixes can coexist.
> >
> > Cool. Thanks.
> >
> > May I commit my patch with this one case not yet working? Or, less
> > onerously, do you agree that the merge_file_deleted method is being
> > called incorrectly and we should look to fix it as a separate exercise?
> I think you can commit it and mark merge_tests.py 77 as XFail (with a
> link to this thread in the test's comments). I'm still fairly certain
> I can tweak the 3067-related code to work with it (though I still
> haven't quite got it working)...

Phew. Thanks. I can't commit until the comparison accounts for
"translation" (keywords, line endings) between repository-normal form
and working-copy form, but that's what I'm doing now.

> P.S. Now do you know why everyone was afraid to review the 3067
> backport for 1.5.1? :-D

Argh. Only too well!

- 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-08 12:54:04 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.