monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Re: Text under revision control


From: Zack Weinberg
Subject: Re: [Monotone-devel] Re: Text under revision control
Date: Thu, 5 Mar 2009 13:05:29 -0800

On Thu, Mar 5, 2009 at 11:16 AM,  <address@hidden> wrote:
> On Thu, Mar 05, 2009 at 09:57:06AM -0800, Zack Weinberg wrote:
>> I'm not actually sure whether the default three-way content merge is
>> line-oriented or byte-oriented.
>
> Would the following be an effective test?
>
>               A
>              / \
>             /   \
>            B     C
>
> where B and C involve changes in different parts of the same line, and
> then try to merge B and C to see if there's a merge conflict?

Yeah, I think so.

Before you go and add stuff to the test suite, please look through the
existing set of Lua testcases with "merge" in their name.  It might
already be there.  (I'll hand out fabulous no-prizes for fixing
existing xfailed tests... ;-)

zw




reply via email to

[Prev in Thread] Current Thread [Next in Thread]