Wed 05 Jul 2006 12:57:45 AM UTC, original submission:
Doing a propagate/explicit_merge between two revisions that have similar merge_into_dirs done at similar points causes MTN to segfault:
GNU gdb Red Hat Linux (6.0post-0.20040223.17rh)
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB. Type "show warranty" for details.
This GDB was configured as "x86_64-redhat-linux-gnu"...Using host libthread_db library "/lib64/tls/libthread_db.so.1".
(gdb) r explicit_merge 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e 4758ee242a47fb06b6d873b387bbb1013f9f916d foo
Starting program: /home/cummings/bin/mtn explicit_merge 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e 4758ee242a47fb06b6d873b387bbb1013f9f916d foo
mtn: [source] 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e
mtn: [source] 4758ee242a47fb06b6d873b387bbb1013f9f916d
Program received signal SIGSEGV, Segmentation fault.
std::_Rb_tree<unsigned int, std::pair<unsigned int const, boost::shared_ptr<node> >, std::_Select1st<std::pair<unsigned int const, boost::shared_ptr<node> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, boost::shared_ptr<node> > > >::find (this=0x8, __k=@0xffff3004) at stl_tree.h:464
464 { return static_cast<_Const_Link_type>(this->_M_impl._M_header._M_parent); }
(gdb) bt
#0 std::_Rb_tree<unsigned int, std::pair<unsigned int const, boost::shared_ptr<node> >, std::_Select1st<std::pair<unsigned int const, boost::shared_ptr<node> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, boost::shared_ptr<node> > > >::find (this=0x8, __k=@0xffff3004) at stl_tree.h:464
#1 0x08243866 in roster_t::has_node (this=0xc, n=3924) at stl_map.h:513
#2 0x08108666 in content_merge_database_adaptor::get_ancestral_roster (this=0xffff32c0, nid=3924, anc=@0xffff31f0) at shared_ptr.hpp:252
#3 0x082ae1e7 in resolve_merge_conflicts (left_rid=@0xffff35f0, right_rid=@0xffff35e0, left_roster=@0xffff3470, right_roster=@0xffff3410, left_marking_map=@0xffff3450, right_marking_map=@0xffff33f0, result=@0xffff3300,
adaptor=@0xffff32c0, app=@0xffff3820) at merge.cc:81
#4 0x082aedf1 in interactive_merge_and_store (left_rid=@0xffff35f0, right_rid=@0xffff35e0, merged_rid=@0x8, app=@0xffff3820) at merge.cc:148
#5 0x080d14b9 in commands::cmd_explicit_merge::exec (this=0x851a760, app=@0xffff3820, args=@0x3e8) at cmd_merging.cc:552
#6 0x080b1232 in commands::process (app=@0xffff3820, cmd=@0xffff3800, args=@0x8) at stl_map.h:332
#7 0x082baabe in cpp_main (argc=138623368, argv=0xffff4184) at monotone.cc:643
#8 0x082bc468 in main_with_signal_handlers (argc=5, argv=0xffff4184) at main.cc:304
#9 0x082bc640 in main (argc=8, argv=0x8) at main.cc:374
--Jack
|