[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: Text under revision control
From: |
hendrik |
Subject: |
Re: [Monotone-devel] Re: Text under revision control |
Date: |
Fri, 29 May 2009 15:00:28 -0400 |
User-agent: |
Mutt/1.5.13 (2006-08-11) |
On Fri, May 29, 2009 at 06:39:18PM +0000, Hendrik Boom wrote:
> On Thu, 05 Mar 2009 13:05:29 -0800, Zack Weinberg wrote:
>
> I finally got around to performing the test, using nonoverlapping changes
> in one line. B had a change near the beginning of the line; C had
> changes near the end of the line. When merging the two heads, monotone
> detected a conflict and it had to be resolved manually.
>
> So. Monotone does appear to merge on a line-by-line basis.
>
> Too bad for OpenOffice's .fodt file type.
Actually, byte-by-byte or word-by-word probably wouldn't be enough. We'd need
something that can guarantee to produce valid XML that satisfies Open Document
Format
syntax.
-- hendrik