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

[PATCH] 'svn update' tree conflict tests

From: Stephen Butler <sbutler_at_elego.de>
Date: 2007-11-06 16:29:29 CET

Hi folks,

Attached is a patch for testing 'svn update', intended to help clarify the
discussion of tree conflicts. Note that the current trunk exhibits the
same behavior as 1.4.5.

If there is interest, I have corresponding test cases for merge and for
commit (in the presence of tree conflicts). But these two simple
update tests are probably enough for now.


New test cases for current and proposed tree-conflict behavior.
See notes/tree-conflicts/use-cases.txt, use cases 1-3.

* subversion/tests/cmdline/update_tests.py
    (tree_conflicts_in_updated_files_current): new, for 1.4 and 1.5 behavior
    (tree_conflicts_in_updated_files): new, for proposed behavior (XFail)
    (test-list): added new tests


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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Thu Nov 8 00:13:56 2007

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.