On Saturday, July 9, 2005 at 11:16:44, Matthieu Moy wrote: > Robert Widhopf-Fenk <[EMAIL PROTECTED]> writes: > > > My problem comes from a call to arch_archive_connect_branch > > within arch_build_revision. It was called for an archive > > which I did not register and thus returned NULL. > > Which archive was it?
[EMAIL PROTECTED] Below you find how to reproduce my problem. "tla star-merge" and "baz merge" are certainly not doing the same, just look at the resulting trees, but my understanding of "baz merge" was that it is smarter version of "tla star-merge", and can be used where "tla star-merge" was used. So using replay or apply-changeset is a workaround, but not exactly what I want. Maybe I need a lecture about the differences in merge algorithms ... :-) Or is something wrong with my archive? ****************************************************************************** > tla -V tla tla-1.3-1 from regexps.com Copyright 2003 Tom Lord This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Report bugs to [EMAIL PROTECTED] # automatically generated release id (by arch-buildpackage) tla-1.3-1 > baz -V baz Bazaar version 1.4.1 ([EMAIL PROTECTED]/dists--bazaar--1.4[bazaar--devo.cfg]) from Canonical Ltd. and other members of the arch community Copyright 2004,2005 Canonical Ltd. Copyright 2003 Tom Lord. Copyright 2003-2005 Various Contributors This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Report bugs to [EMAIL PROTECTED] Bazaar version 1.4.1 ([EMAIL PROTECTED]/dists--bazaar--1.4[bazaar--devo.cfg]) ****************************************************************************** # I did the following, but do this only on a test account # rm -rf xtla--main--1.1--patch-19/ .arch-params/ .arch-cache/ tla register-archive http://www.robf.de/Hacking/arch/2005 tla get [EMAIL PROTECTED]/xtla--main--1.1--patch-19 cd xtla--main--1.1--patch-19 tla register-archive http://arch.xsteve.at/2005 tla star-merge [EMAIL PROTECTED]/xtla--main--1.1--patch-19 # success tla undo baz merge [EMAIL PROTECTED]/xtla--main--1.1--patch-19 # you get: baz: uncaught exception: -1:(exiting on botched invariant) baz undo cp \{arch}/++default-version \{arch}/++pristine-trees/unlocked/xtla/xtla--main/xtla--main--1.1/[EMAIL PROTECTED]/xtla--main--1.1--patch-19/\{arch}/ baz merge [EMAIL PROTECTED]/xtla--main--1.1--patch-19 # you get: baz: uncaught exception: -1:(exiting on botched invariant) baz undo tla register-archive http://mani.sourceforge.jp/arch/xtla baz merge [EMAIL PROTECTED]/xtla--main--1.1--patch-19 # success! (with conflicts) ****************************************************************************** Robert. _______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
