All pastes #803083 Raw Edit

Something

public text v1 · immutable
#803083 ·published 2007-11-30 21:44 UTC
rendered paste body
My first step was to pull from an external server that is ok and has pr34130.patch 

$ mtn --db=mamona.mtn pull monotone.openembedded.org org.openembedded.dev
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to monotone.openembedded.org
mtn: finding items to synchronize:
mtn: certificates | keys | revisions
mtn:       59,087 |   66 |    19,474
mtn:  bytes in | bytes out | certs in | revs in
mtn:    43.1 k |    29.3 k |    24/24 |     6/6
mtn: successful exchange with monotone.openembedded.org

After this I need to propagate the changes to another branche org.openembedded.mamona that doesn't have pr34130.patch And actually this file has never being there...

mtn: propagating org.openembedded.dev -> org.openembedded.mamona
mtn: [source] b0ab0f4e07bfe9d3b9a4dc2a42f1e5530d23a577
mtn: [target] cf0fec15f5b756bf8b63f01d5fe08f390aaee0c9
mtn: warning: orphaned node conflict on node 22,633, dead parent 20,282, name pr34130.patch
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts