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-20

2005-07-01 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-20

    Summary:
      Added a --show-ancestor to apply-delta and merge, --three-way default for apply-delta
    Revision:
      bazaar--devo--1.5--patch-20

    Patches applied:
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--base-0
       tag of thelove at canonical.com/bazaar--devo--1.5--patch-19
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-1
       Added a --show-ancestor to apply-delta and merge
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-2
       Make --three-way default and obsolete for apply-delta.
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-3
       Fixed docstring for baz register-archive.
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-4
       Fixed multiple definition of opt_show_ancestor
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-5
       Don't use apply-delta --three-way in tests
    
     * Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-6
       Fixed another testcase
    

    modified files:
     commands/apply-delta.c commands/merge.c
     commands/register-archive.c libarch/apply-changeset.c
     libarch/apply-changeset.h libarch/merge-three-way.c
     libarch/merge-three-way.h libarch/merge.c libarch/merge.h
     tests/test-merge.sh tests/test-switch.sh

    new patches:
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--base-0
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-1
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-2
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-3
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-4
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-5
     Matthieu.Moy at imag.fr--public/bazaar--three-way--1.5--patch-6
     thelove at canonical.com/bazaar--devo--1.5--patch-20