[Monotone-devel] Re: [Monotone-users] Missing root conflicts

[Thomas Keller]

Am 22.01.11 07:12, schrieb Aaron W. Hsu:
> Hello,
> 
> How can I fix a missing root conflict? Specifically, it appears that I
> have two histories for a single branch:
> 
> A1       A2
>  |        |
>  o        o
>  |       / \
>  o      o   o
>          \ /
>           o
> 
> I wish to merge these two, but I get the following error:
> 
> mtn: 2 heads on branch '---'
> mtn: merge 1 / 1:
> mtn: calculating best pair of heads to merge next
> mtn: [left]  443bbee8302f4f2b9415755ad70d65421293f8c1
> mtn: [right] ce3f4f6e5ef8a261df438a6a5f5c01c4f185e5a8
> mtn: conflict: missing root directory
> mtn: conflict: duplicate name '' for the directory ''
> mtn: added as a new directory on the left
> mtn: added as a new directory on the right
> mtn: misuse: merge failed due to unresolved conflicts
> 
> I think this is because two root directories have been added. However, I
> cannot figure out how to use pivot_root to fix this. Does anyone have a
> suggestion?

I'd try it with merge_into_dir - but if that does not work I think the
best solution is to get rid of the other tree in your branch. So either
suspend the head(s) when you already synced them somewhere or remove the
wrong branch cert from the other tree and eventually merge in the wanted
changes by hand.

Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature