monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] error in mtn merge hook


From: Faré
Subject: [Monotone-devel] error in mtn merge hook
Date: Fri, 9 Nov 2007 17:24:16 -0500

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 | Reflection&Cybernethics | 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]