I found yet another small error in the patch:
It should say status='C ' instead of 'C'. I had fixed one of them, but
overlooked the four others.
Neels Hofmeyr wrote:
> Neels Hofmeyr wrote:
>>> Is the attached patch for "update_tests.py" what you expect? (This patch
>>> doesn't make the change to expect the victim to be reported, but just
>>> the other changes we talked about in this thread so far.)
>> Yes, that looks very good, except that you need to copy() a tree before
>> tweaking it. Otherwise, the global is tweaked, leaving a smudge behind in
>> subsequent use. I've attached another diff.
> Actually, this newer version of the patch makes it worthwhile -- I have
> tested it and resolved some minor trouble.
> Only for STATUS trees, one also needs to add attributes to the
> (non-existent) root node. This is done by adding an item with a zero length
> path ('').
(same log message)
Change tree-conflicts tests in update_tests.py so that they pass the
behaviour agreed upon on the dev mailing list, and XFail() them. Also apply
Patch by: julianfoad
Neels Hofmeyr <neels_at_elego.de>
* subversion/tests/cmdline/update_tests.py (tree_conflicts_on_update_1_1,
Adjust the expected behaviour for these tests. Change them to XFail in
the tests list.
* subversion/tests/cmdline/svntest/actions.py (deep_trees_virginal_state,
deep_trees_after_leaf_edit, deep_trees_after_leaf_del): Expand these
structures to contain a separate node item for each parent directory,
because this is needed for tweak() to work.
* subversion/tests/cmdline/svntest/wc.py (tweak): Wrap an error message in
square brackets so that it is printed as string and not as an array with
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2008-09-02 04:27:22 CEST