[Top][All Lists]

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

[Monotone-devel] Three way merge fails

From: Matthew A. Nicholson
Subject: [Monotone-devel] Three way merge fails
Date: Mon, 14 Feb 2005 15:58:54 -0600
User-agent: Debian Thunderbird 1.0 (X11/20050116)

I get the following error when attempting a three way merge.  Monotone

monotone --version
monotone 0.16 (base revision: ce860bae312c4bb8483d5b3b2a8cd3bebe2323d5)

monotone: expanding command 'prop'
monotone: expanded command to 'propagate'
monotone: propagating com.digium.qview -> com.digium.qview.mnicholson
monotone: [source] 23a6b202493f7ae1544b6da2d5684d90b3f18c8f
monotone: [target] 03337bf19466c529ffd4a0c64b65e8fdda74e93d
monotone: common ancestor 341bd44cb07f273b3230668d227967c40c5f86fb found
monotone: trying 3-way merge
monotone: help required for 3-way merge
monotone: [ancestor] qview.c
monotone: [    left] qview.c
monotone: [   right] qview.c
monotone: [  merged] qview.c
executing external 3-way merge command: gvim -d -c "file /tmp/mt.SOoJ1F" "/tmp/mt.1VFhJW" "/tmp/mt.k60S5Q" "/tmp/mt.ZDoqvL"
3 files to edit
monotone: misuse: merge of 'qview.c' : 'a82b1586c8401f9ca96fb83d625747bbb6dfc949' -> '1997cc15ca3cdbe6814a242cbfef9461566c8ccc' vs '285326a87e806bbe44fbb42aaf399a4fa6fe2cfc' failed

Any ideas? I have also updated the standard merge commands to support vimdiff. Patches are attached in a seperate email.

Matthew A. Nicholson

reply via email to

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