[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: naughty merge tool
From: |
Julio M. Merino Vidal |
Subject: |
[Monotone-devel] Re: naughty merge tool |
Date: |
Sat, 19 Feb 2005 12:02:12 +0100 |
On Fri, 2005-02-18 at 19:56 -0800, Nathaniel Smith wrote:
> I've just noticed that there's some minor corruption in monotone's
> ChangeLog; in particular, "Wojciech Mi<non-ascii>kowski" is having his
> name gradually changed by the insertion of more non-ascii bytes. My
> best guess right now as to the cause is that some external merge tool
> is not playing nice with utf-8.
>
> The reason this is my best guess is that I can't cause it to happen
> again locally just by poking at monotone, and the two most recent
> times it's happened were both merges by Julio. Julio, what merge tool
> do you use?
Oh, I forgot to mention this. I used emacs for the merges, but vim to
do the original editing. Are the versions before the merges still
correct?
Cheers,
PS: Why am I not getting my own emails to the list??
--
Julio M. Merino Vidal <address@hidden>
http://www.livejournal.com/users/jmmv/
The NetBSD Project - http://www.NetBSD.org/