Re: [Monotone-devel] error message: invariant violated in diff_patch.cc

[pHilipp Zabel]

On 8/9/06, Nathaniel Smith <address@hidden> wrote:
> On Tue, Aug 08, 2006 at 07:44:05AM +0200, pHilipp Zabel wrote:
> > # monotone update
> > mtn: updating along branch 'org.openembedded.dev'
> > mtn: selected update target 8e90244a719ea0f6cc33218bf925484a5a4e1855
> > mtn: fatal: std::logic_error: diff_patch.cc:583: invariant
> > 'I(temporary_store.find(merged_id) == temporary_store.end())' violated
>
> Right, turned out to be trivial -- someone was a little over-paranoid
> and effectively put in a check that two different merges wouldn't
> resolve to identical files.  I just took the check out on mainline,
> and the fix will be in 0.29.

Great. I worked around this by reverting those files, updating and
doing the changes again.

thanks
Philipp