[Monotone-devel] Re: Killing a revision

[Tom Koelman]

Nathaniel Smith <address@hidden> writes:

> On Mon, Jun 13, 2005 at 02:53:25PM +0200, Tom Koelman wrote:
>> 
>> Hi,
>> 
>
>> I use monotone 0.19 on Win32. I committed some stuff, only to realize
>> later that I made a mistake. No problem: I just did the commit again
>> in the right way. Only now I have two heads: one with the wrong
>> commit, one with the right one.
>> 
>> Now, how do I kill off the wrong one? kill_rev_locally is not an
>> option, because I already synched to a remote database. As far as I
>> know there is no way to declare a certain revison "dead" or the
>> like. As long as the old one remains I keep having multiple heads,
>> which is not nice.
>
> $ monotone disapprove <bad rev>  # commits the inverse changeset
> $ monotone merge   # should be a trivial merge

Thanks. Although I don't really like this way of getting a revision to
dead end, I tried it anyway. Unfortunately it bombed on me when
merging. Disapproving went okay and committed a new revision
(aa8253a205e7ca5f9a3e69beba1fe8d67e78da02), but the merge gave me:

monotone: starting with revision 1 / 2
monotone: merging with revision 2 / 2
monotone: [source] aa8253a205e7ca5f9a3e69beba1fe8d67e78da02
monotone: [source] ea03f55de375f96c9a10ea4ee6efa13e84fb8bf2
monotone: common ancestor 8ccf69151d275231f436377afd6ee6bf51a8dfa9 found
monotone: trying 3-way merge
monotone: fatal: std::logic_error: change_set.cc:487: invariant 'I(j != 
deltas.end())' violated
monotone:
monotone: this is almost certainly a bug in monotone.
monotone: please send this error message, the output of 'monotone 
--full-version',
monotone: and a description of what you were doing to address@hidden
monotone: wrote debugging log to MT/debug


The last few lines of debug read:

finished concatenation
change_set.cc:487: invariant 'I(j != deltas.end())' violated
db.execute("ROLLBACK")

monotone --full-version gives:

monotone 0.19 (base revision: ac4b3dd3c60eb95aa18e01d0f525a5dcfa85567c)
Running on: Windows NT/2000/XP (5.0, build 2195) on ia32 (level 15, rev 521)
Changes since base revision:

new_manifest [6aa680c77dc02652f1b969174faece55a94ee60a]

old_revision [ac4b3dd3c60eb95aa18e01d0f525a5dcfa85567c]
old_manifest [6aa680c77dc02652f1b969174faece55a94ee60a]


  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.


Regards,
Tom Koelman