Re: [Monotone-devel] error in mtn merge hook
Interestingly, merger = foo wasn't enough to avoid the buggy hook, but MTN_MERGE=foo was. Thanks a lot! [ François-René ÐVB Rideau | ReflectionCybernethics | 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 Monotone-devel@nongnu.org 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. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] error in mtn merge hook
I have the below problem when I try to merge one of my branches with monotone 0.37 (base revision: c21eefc002b8f9c430e9f4cc16c4af7b852f54ec) on debian i386. Can you suggest a way to be able to merge and update? It looks like a bug in monotone's standard lua hooks for merging. [ François-René ÐVB Rideau | ReflectionCybernethics | http://fare.tunes.org ] Disraeli was pretty close: actually, there are Lies, Damn lies, Statistics, Benchmarks, and Delivery dates. $ mtn merge mtn: 2 heads on branch 'foo.bar' mtn: [left] bb31655ab850f2c23bb2436412f67ff2e7328c1b mtn: [right] d48fe36ef6f586616e295c0165f70b0047160517 mtn: help required for 3-way merge mtn: [ancestor] secrets mtn: [left] secrets mtn: [ right] secrets mtn: [ merged] secrets mtn: warning: [string std hooks]:796: bad argument #2 to 'format' (string expected, got nil) mtn: error: merge failed due to unresolved conflicts ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] error in mtn merge hook
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 Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
