|
From: | Tomas Fasth |
Subject: | [Monotone-devel] monotone: fatal: std::logic_error: revision.cc:260: invariant 'I(cs_left == cs_right)' violated |
Date: | Wed, 10 Aug 2005 00:20:33 +0200 |
User-agent: | Mozilla Thunderbird 1.0.6 (Windows/20050716) |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello I tried to merge my version of debian/changelog with the latest pull from venge.net and got an error as described in the subject line. To simplify the case I initially only refer to the changelog versions in the outline below. More details further down in the text. Monotone version is 0.22. venge.net repository version of debian/changelog was: 0.22-0.1 by Nathaniel. 0.21-0.1 by Nathaniel. 0.20-1 by me. ... My local repository version of debian/changelog was: 0.22-1 by me. 0.22-0.1 by Nathaniel. 0.21-3 by me. 0.21-2 by me. 0.21-1 by me. 0.21-0.1 by Nathaniel. 0.20-1 by me. ... Trying to merge gave the following error: monotone: fatal: std::logic_error: revision.cc:260: invariant 'I(cs_left == cs_right)' violated To work around the problem I changed debian/changelog (simplified diff): - - 0.22-1 by me. - - 0.22-0.1 by Nathaniel. - - 0.21-3 by me. - - 0.21-2 by me. - - 0.21-1 by me. 0.21-0.1 by Nathaniel. 0.20-1 by me. ... After a sucessful commit I then did (simplified diff): + 0.22-1 by me. + 0.22-0.1 by Nathaniel. + 0.21-3 by me. + 0.21-2 by me. + 0.21-1 by me. 0.21-0.1 by Nathaniel. 0.20-1 by me. ... Which did the trick and I could successfully sync with venge.net. Here follows a more detailed output: address@hidden:~/work/monotone/monotone/debian$ mt commit monotone: beginning commit on branch 'net.venge.monotone' enter passphrase for key ID address@hidden: monotone: committed revision deef8ad515d11918dbd0b959ff05ea9a88a7f221 monotone: note: this revision creates divergence monotone: note: you may (or may not) wish to run 'monotone merge' address@hidden:~/work/monotone/monotone/debian$ mt merge monotone: starting with revision 1 / 2 monotone: merging with revision 2 / 2 monotone: [source] 8f5da2ff98cf729256cec8d2ccca3a0c8fc7bfa9 monotone: [source] deef8ad515d11918dbd0b959ff05ea9a88a7f221 monotone: common ancestor e9ec2bd2a80cc3deb7d386d1e6a260ff671c6d57 address@hidden 2005-07-07T09:43:59 found monotone: trying 3-way merge monotone: help required for 3-way merge monotone: [ancestor] debian/changelog monotone: [ left] debian/changelog monotone: [ right] debian/changelog monotone: [ merged] debian/changelog executing external 3-way merge command monotone: fatal: std::logic_error: revision.cc:260: invariant 'I(cs_left == cs_right)' violated The intermediate revisions I used to work around the problem was 527a8d9b1befce90cb1e6755c5414e5746e4f1a7 and 41f00a2765622e6cfce11625a73218e77a8307a8. Let me know if you need more info. - -- Tomas Fasth <address@hidden> GnuPG Fingerprint: DC7B 9453 7F26 1BF9 6B21 9F90 C187 7355 9FE8 D504 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFC+SwxwYdzVZ/o1QQRAokbAJ9fyk8oD2a9XuhAzVVXSsSuHivzpwCfQrFC 8jYnNS0iU7tp2ZFQ3yI8CLE= =TgjY -----END PGP SIGNATURE-----
[Prev in Thread] | Current Thread | [Next in Thread] |