> -----Original Message-----
> From: Neels Janosch Hofmeyr [mailto:neels_at_elego.de]
> Sent: woensdag 24 juni 2009 1:21
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r38181 - in trunk/subversion: libsvn_client
> tests/cmdline
>
> Author: neels
> Date: Tue Jun 23 16:20:37 2009
> New Revision: 38181
>
> Log:
> * subversion/libsvn_client/merge.c
> (merge_dir_added): Use special case function tree_conflict_on_add().
>
> * subversion/libsvn_client/repos_diff.c
> (add_directory, close_file): Skip notify on tree-conflicts during a
> replace.
> Add comment and some whitespace.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_replace_causes_tree_conflict): Inflate the test to use all of
> the cases (dir|file) replaces (dir|file).
> (test_list): Pass merge_replace_causes_tree_conflict().
This test is now failing on the Windows buildbot while it passed before.
See http://crest.ics.uci.edu/buildbot/waterfall
EXPECTED STDOUT (unordered):
D svn-test-work\working_copies\merge_tests-132\branch\mu
D svn-test-work\working_copies\merge_tests-132\branch\B\E/alpha
D svn-test-work\working_copies\merge_tests-132\branch\B\E/beta
D svn-test-work\working_copies\merge_tests-132\branch\B\E
D svn-test-work\working_copies\merge_tests-132\branch\D\G\pi
D svn-test-work\working_copies\merge_tests-132\branch\D\H/chi
D svn-test-work\working_copies\merge_tests-132\branch\D\H/omega
D svn-test-work\working_copies\merge_tests-132\branch\D\H/psi
D svn-test-work\working_copies\merge_tests-132\branch\D\H
ACTUAL STDOUT:
D svn-test-work\working_copies\merge_tests-132\branch\mu
D svn-test-work\working_copies\merge_tests-132\branch\B\E\alpha
D svn-test-work\working_copies\merge_tests-132\branch\B\E\beta
D svn-test-work\working_copies\merge_tests-132\branch\B\E
D svn-test-work\working_copies\merge_tests-132\branch\D\G\pi
D svn-test-work\working_copies\merge_tests-132\branch\D\H\chi
D svn-test-work\working_copies\merge_tests-132\branch\D\H\omega
D svn-test-work\working_copies\merge_tests-132\branch\D\H\psi
D svn-test-work\working_copies\merge_tests-132\branch\D\H
EXCEPTION: SVNLineUnequal
There are a few '/' directory separators in the expected output.
Bert
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2364995
Received on 2009-06-24 17:57:42 CEST