[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: naughty merge tool
From: |
Nathaniel Smith |
Subject: |
Re: [Monotone-devel] Re: naughty merge tool |
Date: |
Sat, 19 Feb 2005 13:49:34 -0800 |
User-agent: |
Mutt/1.5.6+20040907i |
On Sat, Feb 19, 2005 at 12:02:12PM +0100, Julio M. Merino Vidal wrote:
> 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?
It seems to just be the merges, not the editing.
> PS: Why am I not getting my own emails to the list??
Log into your mailman account on the website; there's a setting for
this there.
-- Nathaniel
--
The Universe may / Be as large as they say
But it wouldn't be missed / If it didn't exist.
-- Piet Hein