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

Merging the tree-conflicts branch to trunk

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 15 Sep 2008 17:27:08 +0100

I am merging the tree-conflicts branch to trunk today. This is by no
means "finished". Some tree-conflict behaviour is not yet done or not
yet as we want it. The merge is to facilitate further work in this area.

What's good?

  - Many tree conflict situations will be detected and reported, and
will block any attempt to commit until marked as resolved.

  - Most existing test pass. (Some were modified to expect the new

What's not so good?

  - Several existing tests are marked XFail, mostly because they don't
expect the new behaviour and the new behaviour is not yet as we want it

Following this merge, we can more easily set about fixing these
outstanding issues and improving the UI and doing code reviews and
whatever else is needed.

Thanks again to those who have provided support and feedback so far, and
may we start seeing the light of this feature!

- Julian

[1] The newly XFail tests are:
checkout_tests.py 13: co handles obstructing paths scheduled for add
update_tests.py 31: forced up fails with some types of obstructions
update_tests.py 33: update wc containing a replaced-with-history file
update_tests.py 34: update handles obstructing paths scheduled for add
update_tests.py 46: tree conflicts on update 1.1
update_tests.py 47: tree conflicts on update 1.2
update_tests.py 48: tree conflicts on update 2.1
update_tests.py 49: tree conflicts on update 2.2
update_tests.py 50: tree conflicts on update 3
switch_tests.py 21: forced switch fails with some types of obstruction
switch_tests.py 24: switch tolerates WC adds
switch_tests.py 33: tree conflicts on switch 2.1
merge_tests.py 19: merge should skip over unversioned obstructions
merge_tests.py 20: merge into missing must not break working copy
merge_tests.py 39: conflict from merge of add over versioned file
merge_tests.py 68: mergeinfo recording in skipped merge
merge_tests.py 103: merge tries to delete a file of different content
tree_conflict_tests.py 8: up/sw dir: add onto add
tree_conflict_tests.py 14: merge dir: del/rpl/mv onto not-same

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-15 18:22:34 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.