phi...@apache.org writes: > Author: philip > Date: Mon Feb 4 17:00:16 2013 > New Revision: 1442177 > > URL: http://svn.apache.org/viewvc?rev=1442177&view=rev > Log: > Layered moved-to doesn't work yet. > > * subversion/tests/libsvn_wc/op-depth-test.c > (layered_moved_to): Extend. > (test_funcs): Mark layered_moved_to XFAIL.
This test starts with A/B/C/D/E, several moves result in E moved to E2 and then a parent of E gets replaced producing a new E that gets moved to E3. An update of A then has to follow the moves to update E2. This test currently fails due to the way the conflict resolver works. The test reaches a state with a delete-edit tree-conflict on X/B/C as a result of the update following some of the moves. This conflict has to be resolved to state 'working' which will remove the tree-conflict on X/B/C and raise a move-edit tree-conflict on X/B/C/D/E. Resolving that new move-edit tree-conflict to state 'mine-conflict' will update E2 and allow the test to pass. However when the resolver is invoked on X/B/C it automatically proceeds to resolve the new tree-conflict on X/B/C/D/E and that causes the test to fail. Having the resolver raise new tree-conflicts is new behaviour. Having the resolver code use the status walker is also new behaviour. To make this work I need the resolver to avoid resolving the newly raised tree-conflict but I'm not sure how best to do this. Sometimes resolving newly raised tree-conflicts is helpful to the user. -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
