Changes to archive thelove@canonical.com/bazaar--devo--1.5

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.5--patch-7

2005-06-03 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-7

    Summary:
      Removed functions returning t_uchar * in local-cache.h
    Revision:
      bazaar--devo--1.5--patch-7

    Patches applied:
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-1
       Fix bug #385: Preset version and revision fields for pristine tree for merge
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-2
       Cleaner and more generic version of the previous patch
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-4
       Removed functions returning t_uchar * for a project tree in local-cache.h
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-5
       Initialize version and revision fields for all functions in local-cache.c
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-6
       Added testcase for #385
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--base-0
       tag of thelove at canonical.com/bazaar--devo--1.4--patch-58
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-1
       Fix bug #385: Preset version and revision fields for pristine tree for merge
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-2
       Initialize version and revision fields for all functions in local-cache.c
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-3
       Use preset fqrevision field if available in arch_merge3
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-4
       OOps: trivial fixes for the previous patch
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-5
       Merge from upstream
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-6
       Fixed arch_greedy_library_wants_revision argument after merging.
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-7
       Merged from upstream (uncompilable)
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-8
       Get something working after merging (passes tests)
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-9
       Renamed arch_find_or_make_tmp_local_copy to arch_find_or_make_tmp_local_tree_copy
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-10
       Fixed compilation warnings
    
     * Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-11
       Added missing #include for str.h
    

    new files:
     tests/.arch-ids/test-pristine-version.sh.id
     tests/test-pristine-version.sh

    modified files:
     commands/annotate.c commands/cmdutils.c commands/revisions.c
     commands/undo.c commands/update.c libarch/archive-cache.c
     libarch/commit.c libarch/file-diffs.c libarch/local-cache.c
     libarch/local-cache.h libarch/merge-three-way.c
     libarch/merge.c libarch/sync-tree.c libarch/tag.c

    new patches:
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-1
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-2
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-4
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-5
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version--1.4--patch-6
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--base-0
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-1
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-2
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-3
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-4
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-5
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-6
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-7
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-8
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-9
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-10
     Matthieu.Moy at imag.fr--public/bazaar--pristine-version-submit--1.4--patch-11
     thelove at canonical.com/bazaar--devo--1.5--patch-7