Neels J Hofmeyr wrote:
> r34456 is the first time that *all* update and switch tests pass the
> *actual* desired behaviour! Completely!!
> Yippie!!!
You were saying -- what?
tree_conflict_tests.py 8?
Hush!
$ alias tg
alias tg='grep "^X*\(FAIL\|PASS\)"'
neels_at_schaf:/arch/elego/svn/trunk/subversion/tests/cmdline
$ source ../../../notes/tree-conflicts/all-tests.sh | tg
PASS: update_tests.py 46: tree conflicts on update 1.1
PASS: update_tests.py 47: tree conflicts on update 1.2
PASS: update_tests.py 48: tree conflicts on update 2.1
PASS: update_tests.py 49: tree conflicts on update 2.2
PASS: update_tests.py 50: tree conflicts on update 2.3
PASS: switch_tests.py 31: tree conflicts on switch 1.1
PASS: switch_tests.py 32: tree conflicts on switch 1.2
PASS: switch_tests.py 33: tree conflicts on switch 2.1
PASS: switch_tests.py 34: tree conflicts on switch 2.2
PASS: switch_tests.py 35: tree conflicts on switch 3
PASS: merge_tests.py 102: merge tries to delete a file of identical content
PASS: merge_tests.py 103: merge tries to delete identical sched-add file
PASS: merge_tests.py 111: natural history filtering permits valid mergeinfo
PASS: merge_tests.py 112: tree conflicts and obstructions
PASS: merge_tests.py 113: tree conflicts on merge, local commit 4.1
PASS: merge_tests.py 114: tree conflicts on merge, local commit 4.2
XFAIL: merge_tests.py 115: tree conflicts on merge, local commit 5.1
XFAIL: merge_tests.py 116: tree conflicts on merge, local commit 5.2
PASS: merge_tests.py 117: tree conflicts on merge, local commit 6
PASS: merge_tests.py 118: tree conflicts on merge, NO local commit 4.1
PASS: merge_tests.py 119: tree conflicts on merge, NO local commit 4.2
XFAIL: merge_tests.py 120: tree conflicts on merge, NO local commit 5.1
XFAIL: merge_tests.py 121: tree conflicts on merge, NO local commit 5.2
PASS: stat_tests.py 31: status with tree conflicts
PASS: info_tests.py 1: info with tree conflicts
PASS: revert_tests.py 19: revert tree conflicts in updated files
PASS: commit_tests.py 59: tree conflicts block commit
PASS: commit_tests.py 60: tree conflicts resolved
PASS: tree_conflict_tests.py 1: up/sw file: modify onto del/rpl/mv
PASS: tree_conflict_tests.py 2: up/sw file: del/rpl/mv onto modify
PASS: tree_conflict_tests.py 3: up/sw file: del/rpl/mv onto del/rpl/mv
PASS: tree_conflict_tests.py 4: up/sw file: add onto add
PASS: tree_conflict_tests.py 5: up/sw dir: modify onto del/rpl/mv
PASS: tree_conflict_tests.py 6: up/sw dir: del/rpl/mv onto modify
PASS: tree_conflict_tests.py 7: up/sw dir: del/rpl/mv onto del/rpl/mv
XFAIL: tree_conflict_tests.py 8: up/sw dir: add onto add
PASS: tree_conflict_tests.py 9: merge file: modify onto not-file
PASS: tree_conflict_tests.py 10: merge file: del/rpl/mv onto not-same
PASS: tree_conflict_tests.py 11: merge file: del/rpl/mv onto not-file
PASS: tree_conflict_tests.py 12: merge file: add onto not-none
PASS: tree_conflict_tests.py 13: merge dir: modify onto not-dir
XFAIL: tree_conflict_tests.py 14: merge dir: del/rpl/mv onto not-same
PASS: tree_conflict_tests.py 15: merge dir: del/rpl/mv onto not-dir
PASS: tree_conflict_tests.py 16: merge dir: add onto not-none
~Neels
Received on 2008-11-28 05:09:45 CET