[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [stellation-res] Text merge test case: analysis of 13 and 14
|
OK. Will do.
Regards
Jonathan
----- Original Message -----
From: "Mark C. Chu-Carroll" <mcc@xxxxxxxxxxxxxx>
To: <stellation-res@xxxxxxxxxxxxxxx>
Sent: Tuesday, October 29, 2002 9:46 AM
Subject: Re: [stellation-res] Text merge test case: analysis of 13 and 14
>
> I've fixed the bug that led to the crashes in tests 13 and
> 14. Now, they both run, but the results do not match the
> predicted results in the merge test file. In both cases,
> I believe the generated results to be correct.
>
> In test 13:
> - Delta is unmodified compared to base.
> - Target totally replaces the text from base.
> - The correct result is therefore identical to target. (There
> are no changes from delta to apply to target.) This
> is what the merge algorithm generates.
>
> In test14:
> - There are changes in delta, and target replaces base
> completely. The correct result is a conflict between
> all of delta and all of target. This is what the merge
> algorithm generates.
>
> So tests 13 and 14 appear to work correctly, but the test
> file needs to be updated.
>
> -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
>
>
> _______________________________________________
> stellation-res mailing list
> stellation-res@xxxxxxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/stellation-res
