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

Re: deleted-with-history [sic] after merge

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: Wed, 26 Mar 2008 17:28:38 +0100

On 3/26/08, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> Erik Huelsmann wrote:
> > ... the problem you describe below looks an awful lot like issue
> Issue #1962: "merge of non-empty subdir committed incorrectly".
> Erik, In working on that issue, you added in r26169 a test for this behaviour
> in merge_tests.py: "merge added subtree".

> Could you or I re-add that test as XFAIL now? I tried. All that is needed to
> update it is to add an initial parameter "disk" to the call to
> "compare_trees()". It looks like a valid test to have.

Yes, that's probably a good idea. When I bailed out, I didn't think I
was going to resolve the issue any time soon, so I reversed all the
work, without looking twice to see which parts might have value added.

> Do you have any idea how to progress this? It sounds like your final comment
> below - "... we'll need to design what we want..." - is the crux.

Right. I'm actually trying to come up with a design for wc-ng which
addresses this issue. I'm not sure it's actually worth the trouble of
trying to update wc-1.0 at this stage: the more things we fix, the
more it seems to get broken in unexpected ways.

By coming up with a completely new design, I hope to address many of
these issues. Maybe the new design can even guide further development
of wc-1.0 for a little while, fixing any long standing issues before
wc-ng materializes.



To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-26 17:28:50 CET

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