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 19 analysis

Test19 is correct.

The changes as seen by Stellation are:
base->delta: delete "xyz" from line 3 of base;
   	     insert "xyz" at the end.
base->target: insert "xyz" at line 0.
	      delete xyz @ line 3 of base.

So the correct merge result is:
	[xyz, abc, def, ghi, abd, deg, ghk, xyz]

This is what the merge generates.

	-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