monotone-devel
[Top][All Lists]
Advanced

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

[Monotone-devel] Fwd: [BUG] "propagate" after "propagate"


From: Catalin Marinas
Subject: [Monotone-devel] Fwd: [BUG] "propagate" after "propagate"
Date: Wed, 23 Feb 2005 12:53:33 +0000
User-agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux)

Hi,

I tried a simple test of creating 2 branches and running "propagate"
from one to the other. It works fine if there are changes to be
propagated but if not, it fails:


$ monotone --full-version
monotone 0.16 (base revision: ce860bae312c4bb8483d5b3b2a8cd3bebe2323d5)
Changes since base revision:

new_manifest [da39a3ee5e6b4b0d3255bfef95601890afd80709]

old_revision []
old_manifest []

$ monotone propagate com.arm.test com.arm.test2
monotone: propagating com.arm.test -> com.arm.test2
monotone: [source] a0aac3443cdad991acc49c160d64f1425631348f
monotone: [target] 0ca5a9c83b03604a4e4658951f18522427b1d590
monotone: common ancestor b91e0ed9b574407dffef7d4f41fedca742d06215 found
monotone: trying 3-way merge

$ monotone propagate com.arm.test com.arm.test2
monotone: propagating com.arm.test -> com.arm.test2
monotone: [source] a0aac3443cdad991acc49c160d64f1425631348f
monotone: [target] 095e23998d474264e3b8f9526439e032b321127b
monotone: common ancestor a0aac3443cdad991acc49c160d64f1425631348f found
monotone: trying 3-way merge
monotone: discarding debug log
monotone: fatal: std::runtime_error: db query [SELECT data FROM revisions WHERE 
id = '%q']:  wanted 1 columns, got 0
monotone: this is almost certainly a bug in monotone.


After "propagate", should the source head (a0aa...) become an ancestor
of the new target head? This way the "propagate" command function
wouldn't do anything (I might be misunderstanding all this
heads/branches/merge stuff).

Thanks,

Catalin





reply via email to

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