Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
RE: [stellation-res] Text merge test case: Test 21 analysis 
Test21 is correct.

Base->delta deletes lines 0-3
Base->target deletes lines 4-6.

Combine the two, and the two sets of changes delete
all the lines - so the merge is an empty file. That's
the correct result according to the algebra.

	-Mark

-- 
Mark Craig Chu-Carroll,  IBM T.J. Watson Research Center  
*** The Stellation project: Advanced SCM for Collaboration
***		http://www.eclipse.org/stellation
*** Work Email: mcc@xxxxxxxxxxxxxx  ------- Personal Email: markcc@xxxxxxxxxxx

Back to the top