[Gnu-arch-users] bazaar bug #385 (Re: Stabilizing Bazaar?)

[Matthieu Moy]

[ Cc and Reply-to set to gnu-arch-dev ]

Jérôme Marant <address@hidden> writes:

>>   what things have you run into trouble on?
>
> Those ones:
>
> http://lists.gnu.org/archive/html/gnu-arch-users/2005-05/msg00011.html

The problem here comes from the fact that a pristine tree doesn't
contain the {arch}/++default-version file. Then, for the FROM tree,

  tree->fqversion = arch_tree_version (tree->root);

fails, and tree->fqrevision is kept NULL, and later,
arch_parse_package_name is called with a NULL pointer as the NAME
argument.

#0  panic (str=0x81163c4 "exiting on botched invariant") at 
/home/moy/local/usr/src/bazaar/src/hackerlab/bugs/panic.c:47
#1  0x080cd795 in invariant_test (condition=0, str=0x81123f4 
"arch_valid_package_name (name, arch_maybe_archive, arch_req_package, 1)", 
    file=0x81123a8 
"/home/moy/local/usr/src/bazaar/src/baz/libarch/namespace.c", line=437) at 
/home/moy/local/usr/src/bazaar/src/hackerlab/bugs/panic.c:115
#2  0x080ad6b6 in arch_parse_package_name (type=arch_ret_archive, 
default_archive=0x0, name=0x0)
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/namespace.c:437
#3  0x08070c27 in cached_archive_connection (patch_id=0x0, soft_errors=1) at 
/home/moy/local/usr/src/bazaar/src/baz/libarch/ancestry.c:200
#4  0x08071c11 in arch_ancestry_from_revision (patch_id=0x0, soft_errors=1) at 
/home/moy/local/usr/src/bazaar/src/baz/libarch/ancestry.c:725
#5  0x08070edf in arch_patch_ancestor (patch_id=0x0, soft_errors=1, 
cached_only=0) at /home/moy/local/usr/src/bazaar/src/baz/libarch/ancestry.c:302
#6  0x080713eb in ancestry_scan (patch_id=0x0, maybe_ancestor=0x81dba2c, 
minimum_depth=-1, soft_errors=1)
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/ancestry.c:435
#7  0x08071806 in patch_ancestry (optional_tree=0x81d7690, patch_id=0x0, 
minimum_depth=-1, soft_errors=1)
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/ancestry.c:581
#8  0x080bea20 in arch_project_tree_ancestry (tree=0x81d7690) at 
/home/moy/local/usr/src/bazaar/src/baz/libarch/project-tree.c:540
#9  0x080aa9f4 in arch_ancestry_unique_to_branch (patch_id=0x8193c20 
"address@hidden/branch--0--patch-1", tree=0x81d7690)
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/merge.c:494
#10 0x080aabaa in arch_patch_is_cherrypicked (patch_id=0x8193c20 
"address@hidden/branch--0--patch-1", tree=0x81d7690, trace=0)
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/merge.c:538
#11 0x080aace7 in arch_ancestry_cherrypicked (patches=0x81559cc, 
tree=0x81d7690, trace=0) at 
/home/moy/local/usr/src/bazaar/src/baz/libarch/merge.c:566
#12 0x080aaff9 in arch_nearest_common_ancestor (from_tree=0x81d7690, 
from_archive=0x81595b0 "address@hidden", 
    from_revision=0x8154e50 "branch--0--patch-2", to_tree=0x8154af0, 
to_archive=0x81595b0 "address@hidden", to_version=0x8175ea8 "branch--0", 
    trace=0, tmp_dir=0x8154bd8 "/tmp/test-baz/tree/,,merge.1115758941.26636.1", 
cache_dir=0x8155768 "/tmp/test-baz")
    at /home/moy/local/usr/src/bazaar/src/baz/libarch/merge.c:648
#13 0x080ab297 in arch_star_merge (chatter_fd=1, from_arch=0x8197488, 
from_archive=0x81595b0 "address@hidden", 
    from_revision=0x8154e50 "branch--0--patch-2", to_tree=0x8154af0, 
to_arch=0x0, to_archive=0x81595b0 "address@hidden", 
    to_version=0x8175ea8 "branch--0", cache_dir=0x8155768 "/tmp/test-baz", 
changeset_output=0x0, use_diff3=1, forward=0, escape_classes=82080, 
    show_points_only=0, graph_merge=1, trace=0) at 
/home/moy/local/usr/src/bazaar/src/baz/libarch/merge.c:732
#14 0x08058a61 in arch_cmd_merge (program_name=0x81538a0 "baz merge", argc=1, 
argv=0xbffff5c8)
    at /home/moy/local/usr/src/bazaar/src/baz/commands/merge.c:335
#15 0x0804ac9d in main (argc=2, argv=0xbffff5c4) at 
/home/moy/local/usr/src/bazaar/src/baz/baz/baz.c:145

The example script provided with

  https://launchpad.ubuntu.com/malone/bugs/385 

reproduces the problem for me.

I don't know the best way to fix this.

-- 
Matthieu