[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
RE: [stellation-res] Text merge test case
|
On Sun, 2002-10-27 at 07:59, Jonathan Gossage wrote:
> Here is another one. I am wondering whether it might be sensible for you to
> make the fixes in TextUtils that you need independently of the ACL stuff so
> that I do not inadvertantly just spring new symptoms for a known underlying
> problem.
Would you mind doing a quick checkin with your new test
cases? It'll avoid a bunch of conflict grief later. Thanks!
-Mark
>
>
> :test18
> # Tests for a pair of non-conflicting changes, one in each of the delta
> # and target sequences plus a common change from the base in another line.
> # Base sequence Delta Sequence Target Sequence Result Sequence
> abc abc abc abc
> abc abc abc abc
> abc abc xyz abc
> xyz abc abc xyz
> abc xyz abc abc
> abc abc abc abc
> abc abc abc abc
>
> I believe there are three errors here.
> In line 3 there is a single change in delta that should make it through.
> In line 4 both delta and target agree on a change from base which should
> make it.
> In line 5 there is a single change in target which should be OK.
>
> <snip>
> > >
> > >Of course, if there is a fundamental error in our merge, I'd rather know
> > >it now than later.
> > >
> > > -Mark
> > >
>
> Regards
>
> Jonathan
>
> Personal Email
> jgossage@xxxxxxxx
>
> Business Email
> jonathan@xxxxxxxxxxxxxx
>
>
> _______________________________________________
> stellation-res mailing list
> stellation-res@xxxxxxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/stellation-res
--
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
