Re: Tree-conflicts branch - log message / review
From: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 03 Sep 2008 16:58:42 +0200
Quoting Julian Foad <julianfoad_at_btopenworld.com>:
> The most helpful thing I/we can produce right now is, I think, a summary
Here's some annotations on two themes:
1. What test-patch will make the test pass on the tree-conflicts branch?
As a stopgap, we can patch tests so they pass. We've done this
2. What must we change in the test design to accommodate the new
On trunk, I understand we want XFAIL tests that describe the
a. Detect "deep" tree conflicts.
b. Skip the operation (checkout/update/switch/merge) on a tree
Yes, I added another operation to the list. Doh!! When faced
Are there any other features to take into account? Soon we'll need
* Resolve tree conflicts interactively.
* Handle tree conflicts involving properties.
* Report and resolve tree conflicts directly, not via the parent
I don't think we need them before merging to trunk, since we haven't
Here are my notes on the failing tests:
Needs 'C ' conflict markers in output and status.
Also, the client no longer aborts, so the "ensure checkout fails"
Need to skip the checkout of a tree upon detecting a tree conflict.
> cmdline/update_tests.py 14 15 31 33 34
This is a known crash (when updating or checking out an item, and the
Add 'C ' and stir, to fix the output and status. Some subtests
Need to skip the update of a tree upon detecting a tree conflict.
Same as update tests.py 31 33 34.
> cmdline/merge_tests.py 19 20 39 68 106
A side note: 19, 20, 39 and 68 are all marked XFail on the
cmdline/merge_tests.py 19 merge_skips_obstructions
The usual 'C ' added to output & status of the fourth and fifth
Individual skipped items should not appear in the output of 'svn
In this test, the merge commands are applied to the whole wc_dir. The
(Here are the remaining merge tests. I'll annotate them tomorrow if
cmdline/merge_tests.py 20 merge_into_missing
cmdline/merge_tests.py 34 merge_dir_and_file_replace
cmdline/merge_tests.py 39 merge_add_over_versioned_file_conflicts
cmdline/merge_tests.py 68 mergeinfo_recording_in_skipped_merge
cmdline/merge_tests.py 103 del_differing_file
cmdline/merge_tests.py 106 tree_conflicts_and_obstructions
-- 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-09-03 16:59:06 CEST
This is an archived mail posted to the Subversion Dev mailing list.