Sun 17 Jul 2005 11:18:45 PM UTC, original submission:
I ran:
$ monotone --db=../topo14.db explicit_merge 54fdd6af4d2c050691a81209f4def6cba8bd02a9 8f3e6730c79cd0b99634c02720640fa8454bbf0b com.rochada.topolog.14
I got:
monotone: [source] 54fdd6af4d2c050691a81209f4def6cba8bd02a9
monotone: [source] 8f3e6730c79cd0b99634c02720640fa8454bbf0b
monotone: common ancestor 785bfb12ed5fddee41b731deeffe7f72e08d9960 found
monotone: trying 3-way merge
monotone: fatal: std::logic_error: smap.hh:94: invariant 'I(lagged->first != leader->first)' 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 monotone-devel@nongnu.org.
monotone: wrote debugging log to MT/debug
How I got there:
1) Imported a CVS repository into a branch that I call A here for simplicity. The CVS repository had no branches or merges, only a linear succession of revisions for each file, and tags for releases. The latest working copy has about 50k lines in about 120 source files. No binary files.
2) Checked out an older tagged release (not head), from ca. 30 commits ago.
3) Renamed a variable and committed the result to a new branch B
4) Committed some more revisions on branch B.
5) explicit_merge'd the rev resulting from 3) and the head from A, into A. Only minor conflicts, solved with kdiff3.
6) Committed more revisions to B.
7) Tried to explicit_merge the rev in B two commits after the rev resulting from 3), and the new head in A, into A.
Got the error message from above.
Branch A is named com.rochada.topolog.14.
Branch B is named com.rochada.topolog.14.fpc.
I appended MT/debug.
If you need the .db to fix the bug, please write me at monotone@rochada.com.
Thank you!
|