Re: tree-conflicts: all tests
From: Stephen Butler <sbutler_at_elego.de>
Date: Sun, 19 Oct 2008 00:03:12 +0200
Quoting Neels J Hofmeyr <neels_at_elego.de>:
> Great, thanks a lot! So here's the updated list:
I have a diff that un-deprecates svn_wc_conflicted_p(), using it for text
That's the first step to making notifications and status show tree conflicts
I tried to do both steps in one diff, but it was too confusing.
> - Implement dirs_same_p(), inherently fix entire diff code.
I don't what that is, except that it sounds useful for use case 5.
> - Show status on missing tree conflict victims.
Done in r33620. :-) We still have to eliminate the status 'C ' on the
>
A biggie is the skipping of victims when update/merge discovers they are
Your tree_conflict_on_update_* tests (the "deep" test scenarios) remain
>
Just had another look at tree_conflict_tests.py, and I still don't
Regards,
-- Stephen Butler | Software Developer elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany fon: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org For additional commands, e-mail: dev-help_at_subversion.tigris.orgReceived on 2008-10-19 00:03:28 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.