Re: [Monotone-devel] error in mtn merge hook

[Francois-Rene Rideau]

Interestingly, merger = "foo" wasn't enough to avoid the buggy hook, but
MTN_MERGE="foo" was.
Thanks a lot!

[ François-René ÐVB Rideau | Reflection&Cybernethics | http://fare.tunes.org
]
I do agree that I have to pay for the *opportunity* to read a book or to use
a program; I do not agree that I have to pay for the *right* to do so. --
Faré



Nathaniel Smith wrote:
> 
> 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.
> 
> 
> _______________________________________________
> Monotone-devel mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/monotone-devel
> 
> 

-- 
View this message in context: 
http://www.nabble.com/error-in-mtn-merge-hook-tf4780428.html#a13690602
Sent from the monotone-devel mailing list archive at Nabble.com.