[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] error in mtn merge hook
|
From: |
Nathaniel Smith |
|
Subject: |
Re: [Monotone-devel] error in mtn merge hook |
|
Date: |
Sat, 10 Nov 2007 06:00:40 +0000 |
|
User-agent: |
Mutt/1.5.13 (2006-08-11) |
On Fri, Nov 09, 2007 at 05:24:16PM -0500, Faré wrote:
> mtn: warning: [string "<std hooks>"]:796: bad argument #2 to 'format'
> (string expected, got nil)
> mtn: error: merge failed due to unresolved conflicts
Yes, this is a stupid bug in the message formatting code in the merge
hooks... fixed on mainline.
Workaround is to set a merger explicitly rather than let monotone pick
one, either by adding
merger = "foo"
to your monotonerc, or by setting the environment variable
MTN_MERGE=foo.
Values for foo: meld, tortoise, vim, rcsmerge, diffutils, emacs,
xxdiff, kdiff3, opendiff
-- Nathaniel
--
Electrons find their paths in subtle ways.