> -----Original Message-----
> From: phi...@apache.org [mailto:phi...@apache.org]
> Sent: maandag 7 januari 2013 16:11
> To: comm...@subversion.apache.org
> Subject: svn commit: r1429832 -
> /subversion/trunk/subversion/tests/cmdline/update_tests.py
>
> Author: philip
> Date: Mon Jan 7 15:11:06 2013
> New Revision: 1429832
>
> URL: http://svn.apache.org/viewvc?rev=1429832&view=rev
> Log:
> Adjust the regression test for issue 4037, incoming move with local
> move, to PASS.
>
> * subversion/tests/cmdline/update_tests.py
> (update_moved_dir_file_move): Adjust expectations, resolve tree-conflict
> by following the local move, remove XFAIL.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/update_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/
> update_tests.py?rev=1429832&r1=1429831&r2=1429832&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Jan
> 7 15:11:06 2013
> @@ -5599,7 +5599,6 @@ def update_moved_dir_dir_add(sbox):
> })
> svntest.actions.run_and_verify_status(wc_dir, expected_status)
>
> -@XFail()
> @Issue(4037)
> def update_moved_dir_file_move(sbox):
> "update locally moved dir with incoming file move"
> @@ -5612,15 +5611,13 @@ def update_moved_dir_file_move(sbox):
> svntest.main.run_svn(False, 'update', '-r', '1', wc_dir)
> sbox.simple_move("A/B/E", "A/B/E2")
>
> - # The incoming move should auto-merge such that A/B/F/alpha appears
> - # as moved to A/B/E2/alpha -- this strategy prefers the local user's
> - # change as the solution to the conflict.
> - # ### Ideally, the user should be offered a set of alternative solutions.
> - # ### E.g. the user might prefer if A/B/E2/alpha disappeared and
> A/B/E/alpha
> - # ### appeared as moved to A/B/F/alpha. But the --accept option does not
> yet
> - # ### support tree conflicts.
> + # The incoming "move" creates a tree-conflict as an incoming change
> + # in a local move. We don't yet track moves on the server so we
> + # don't recognise the incoming change as a move.
> expected_output = svntest.wc.State(wc_dir, {
> - 'A/B/E2/alpha' : Item(status='A '),
> + 'A/B/E' : Item(status=' ', treeconflict='C'),
> + 'A/B/E/alpha' : Item(status=' ', treeconflict='D'),
treeconflict='D' ?
I'm surprised that it works that way.
Bert
