RE: [stellation-res] Text merge test case

["Jonathan Gossage" <jgossage@xxxxxxxx>]

Here are two more interesting cases.


:test19
# This one is really problematic. What has happened here is that delta has
# moved line 4 in base to the end and shifted the following lines 1 up
# while target has moved line 4 to the front of the file and shifted
# everything else down 1 line. Ideally the result should show a cross line
# move conflict between line 1 and line 7 and accept the other sub-sequences
# as is since they have not changed in content, only in position.
#
# Base sequence     Delta Sequence    Target Sequence   Result Sequence
  abc               abc               xyz               xyz
  def               def               abc               abc
  ghi               ghi               def               def
  xyz               abd               ghi               ghi
  abd               deg               abd               abd
  deg               ghk               deg               deg
  ghk               xyz               ghk               ghk

There should be one or more conflicts reported here since there are
no reasonable criteria present to prefer the target version over the delta
version.


:test21
# Test the deletion of two disjoint groups of lines, one by delta and
# the other by target
# Base sequence     Delta Sequence    Target Sequence   Result Sequence
  abc               abd               abc               ''
  def               deg               def               ''
  ghi               ghk               ghi               ''
  xyz               ''                xyz               ''
  abd               ''                ''                ''
  deg               ''                ''                ''
  ghk               ''                ''                ''

There should be a conflict reported between the two deletions since there
are no criteria to prefer one over the other.
> >
> >	-Mark

Regards

Jonathan

Personal Email
jgossage@xxxxxxxx

Business Email
jonathan@xxxxxxxxxxxxxx