[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Monotone bug, maybe workaround
From: |
Leif Jakob |
Subject: |
Re: [Monotone-devel] Monotone bug, maybe workaround |
Date: |
Wed, 20 Jul 2005 00:40:11 +0200 |
User-agent: |
Mutt/1.5.9i |
On Tue, Jul 19, 2005 at 09:52:20AM -0700 Justin Patrin wrote:
> Date: Tue, Jul 19, 2005 at 09:52:20AM -0700
> From: Justin Patrin <address@hidden>
> To: To address@hidden
> Subject: [Monotone-devel] Monotone bug
Hi Justin,
> monotone: fatal: std::logic_error: revision.cc:185: invariant
> 'I(*changesets.find(old_id)->second == *old_to_child_changes_p)'
> violated
Guess I've bounced into this bug multiple times as well.... But I
could't provide a database because of closed source... maybe your
database would help?
If you look at the output of your "monotone merge" you will see a parent
revision that was the root of the revision tree (use monotone-viz) and
that merge crashes because of plenty of adds/removes (dont't know why)...
But I've a workaround:
run "monotone heads" and see the two (hex) revisions, then run
"monotone lca $rev1 $rev2" and get the common acestor, now run
"monotone explicit_merge $rev1 $rev2 $ancestor $branch" and
it magically should work...
The "monotone merge" uses some "other" ancestor-algoritm, but that
seems to degrade sometimes...
To be on the safe side make a backup of the database.
Have fun
Leif