Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself
On Wed, 2005-08-24 at 09:38 +0200, Christof Petig wrote: Any idea on how to merge the changes in mainline (propagated to nvm.cvssync.win32) into net.venge.monotone.cvssync? When doing an explicit merge: mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d 0772ad08e5a0c6593219fb22e077929e36afc044 76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync and resolving the first two conflicting files by hand (select third wherever necessary) I get this error. ...It looks like several files in contrib/ and tests/ are deleted+added on one side, but not the other. Tim 4a5,12 delete_file contrib/color-logs.conf delete_file contrib/color-logs.sh delete_file contrib/colorize delete_file contrib/get_stdio.pl 227c235,255 delete_file tests/t_automate_inventory.at --- delete_file tests/t_automate_stdio.at delete_file tests/t_cvsimport_drepper.at delete_file tests/t_lua_includedir.at delete_file tests/t_merge_manual.at delete_file tests/t_rcfile_dir.at delete_file tests/t_restricted_commit_with_inodeprints.at delete_file tests/t_revert_restrict.at delete_file tests/t_status.at delete_file tests/t_update_with_pending_add.at delete_file tests/t_update_with_pending_drop.at delete_file tests/t_update_with_pending_rename.at 764a793,800 add_file contrib/color-logs.conf add_file contrib/color-logs.sh add_file contrib/colorize add_file contrib/get_stdio.pl 844a881,882 add_file tests/t_automate_stdio.at 848a887,888 add_file tests/t_cvsimport_drepper.at 874a915,916 add_file tests/t_lua_includedir.at 880a923,924 add_file tests/t_merge_manual.at 891c935,937 add_file tests/t_refresh_inodeprints.at --- add_file tests/t_rcfile_dir.at add_file tests/t_restricted_commit_with_inodeprints.at 894a941,942 add_file tests/t_revert_restrict.at 898a947,948 add_file tests/t_status.at 900a951,956 add_file tests/t_update_with_pending_add.at add_file tests/t_update_with_pending_drop.at add_file tests/t_update_with_pending_rename.at 2044a2101,2108 patch contrib/color-logs.conf from [] to [87e8ceac1e0a8d173e2a0da01e659d048824e9ed] patch contrib/color-logs.sh from [] to [4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9] 2046c2110 from [6d186a777205d4a1bae5b7fc7b6bf52fc6d83df5] --- from [] 2048a2113,2116 patch contrib/get_stdio.pl from [] to [6bf6efac0e90644da8338ee03e289a6d0f184278] 2802c2870 from [82905ef9235da9d20dc5c56e9e0b3e0a55a919d4] --- from [] 2846c2914 from [fa1e2cb90749522674c28871a9a9971c7984c34c] --- from [] 2954c3022 from [5b4ce1e6a2781a7a841039a1e02a96cc0221f3ff] --- from [] 2976a3045,3048 patch tests/t_merge_manual.at from [] to [30eeeb2ea878e180248e8969dda05c07cd9df743] 3062c3134 from [06128ab21f137c3a69e4fce2db25b0ea3fa424de] --- from [] 3069,3072d3140 patch tests/t_refresh_inodeprints.at from [] to [8fc43d007b60a998430f6fd0dc56962c019511f4] 3076a3145,3148 patch tests/t_restricted_commit_with_inodeprints.at from [] to [0761808634d3e002cf9bd48b83e8a9a4ef088d9a] 3084a3157,3160 patch tests/t_revert_restrict.at from [] to [ca9b1e167516b4b92a5d285da56b7ca076dbd587] 3100a3177,3180 patch tests/t_status.at from [] to [0b361ba1ed3579bcd794fb3edd21a881f4a46e23] 3116a3197,3208 patch tests/t_update_with_pending_add.at from [] to [8394d96a687a14e6dcae400383d3bef0e76d1f78] patch tests/t_update_with_pending_drop.at from [] to [d52d3736c75a01c308500e12237edaf37e8f345f] patch tests/t_update_with_pending_rename.at from [] to [d6e60af87b017d9269e0c3c797c93d0a696648fc] ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself
Any idea on how to merge the changes in mainline (propagated to nvm.cvssync.win32) into net.venge.monotone.cvssync? When doing an explicit merge: mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d 0772ad08e5a0c6593219fb22e077929e36afc044 76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync and resolving the first two conflicting files by hand (select third wherever necessary) I get this error. Since I did not mess with file renaming ... (perhaps the fact that I added/changed a file to/in the now removed netxx/ directory is the problem? *) Since I really want to finish my work on cvssync I'm somewhat stuck with this error. Any hints on how to get this merge done (besides creating a patch, applying by hand and never ever try to merge the heads again :-( ) Yours Christof *) This would lead to the conclusion that removing the added file (md5sum) in netxx/ might solve my problem ... I'll try that later this week. signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself
On Wed, Aug 24, 2005 at 09:38:07AM +0200, Christof Petig wrote: and resolving the first two conflicting files by hand (select third wherever necessary) I get this error. Since I did not mess with file renaming ... (perhaps the fact that I added/changed a file to/in the now removed netxx/ directory is the problem? *) Can we get a --dump? That should contain the inconsistent changesets in question, which should give us some idea of where in particular the problem is... *) This would lead to the conclusion that removing the added file (md5sum) in netxx/ might solve my problem ... I'll try that later this week. Possibly. -- Nathaniel -- The Universe may / Be as large as they say But it wouldn't be missed / If it didn't exist. -- Piet Hein ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself
Nathaniel Smith schrieb: Can we get a --dump? That should contain the inconsistent changesets in question, which should give us some idea of where in particular the problem is... With --debug via private mail? Since the MT/debug file is only 10k bzipped I'll send it to the list, too. Christof dump.bz2 Description: application/bzip signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself
please do not reply to my previous post from [EMAIL PROTECTED] which contained the attachment :-( I wrote (as postmaster) Nathaniel Smith schrieb: Doh! I thought we had MM()'s for those changesets already... that's what was I was execpting to see in the dumpfile. I've just added them in 1acbb9b0ec433d15ce90a6b42459682ac9a181bc, it should give much more useful debugging info here... included (it's 5 times the size) Christof signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
