[Monotone-devel] change_set.cc:343: invariant 'I(isect.empty())' violated

[Peter Simons]

Hi,

while trying to fix my "clobbered" database, I ran into
another interesting problem. The branch 'org.example.cxx'
has two heads right now:

  monotone: branch 'org.example.cxx' is currently unmerged:
  3ebd23ae6c004993419936609da59e06af8affd4 address@hidden 2005-06-23T13:29:05
  a83a04ec61792d724eaa315e8b51f4f342371b70 address@hidden 2005-06-23T13:33:41

The contents of these two heads is _identical_, as running
diff(1) on checked-out versions confirms:

  $ diff -cbr head1 head2
  diff -cbr head1/MT/revision head2/MT/revision
  *** head1/MT/revision    Thu Jun 23 15:35:10 2005
  --- head2/MT/revision    Thu Jun 23 15:35:19 2005
  ***************
  *** 1 ****
  ! 3ebd23ae6c004993419936609da59e06af8affd4
  --- 1 ----
  ! a83a04ec61792d724eaa315e8b51f4f342371b70

However, neither "merge" nor "diff" operations on these
heads will succeed:

  monotone diff --revision 3ebd23ae6 --revision a83a04ec6
  monotone: expanded to '3ebd23ae6c004993419936609da59e06af8affd4'
  monotone: expanded to 'a83a04ec61792d724eaa315e8b51f4f342371b70'
  monotone: fatal: std::logic_error: change_set.cc:343: invariant 
'I(isect.empty())' violated

The monotone version I'm using is:

  monotone 0.19 (base revision: b71abfb61637f1a8a80b304ae8e54ac572671e39)

IMHO, merging two branches with identical contents should be
possible. ;-)

Peter