Re: svn commit: r1446548 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

"Bert Huijben" <bert_at_qqmail.nl> writes:

>> + # Adding prev_status=' ' and prev_treeconflict='C' to A will make
>> + # the test PASS but why are we getting two conflicts?
>> expected_output = svntest.wc.State(wc_dir, {
>> + 'A' : Item(status=' ', treeconflict='C'),
>> })
>
> Thanks for tweaking...
>
> Yes, this looks strange. We had one conflict before your work
> (standard shadowed update). Is the other one caused by the revision
> bump?

Yes. There is a comment /* ### Look for existing conflict? */.

Obviously I was mistaken but I was under the impression that the update
code didn't raise a tree-conflict when simply bumping a subtree of a
delete. Perhaps that changed recently?

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download