[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 11:02:19 +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?
emacs 21. The two times I've saved the file after merge, emacs asked
which charset was the correct one. The first time, it guessed UTF-8
correctly, so I did nothing else. The second one, though, it said
a different thing ("mule-something" maybe?), so I manually changed it
to UTF-8... (hoping it was the correct thing to do).
Dunno what I did incorrectly; sorry :( Maybe I have to set some
special variable in emacs?
Cheers,
--
Julio M. Merino Vidal <address@hidden>
http://www.livejournal.com/users/jmmv/
The NetBSD Project - http://www.NetBSD.org/