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

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.2--patch-20

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

    Summary:
      Wrote more tests for conflict handling, which showed some hidden bugs that this takes care of
    Revision:
      bazaar--devo--1.2--patch-20

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-18
       conflict handling now correctly deals with adding more conflict files
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-19
       I wrote more tests for the conflict handling, and it found a bug, which is fixed
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-20
       Brown paper bag mistake on not initializing tree_root
    

    modified files:
     libarch/apply-changeset.c libarch/conflict-handling.c
     tests/test-conflicts.sh

    new patches:
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-18
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-19
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-20
     thelove at canonical.com/bazaar--devo--1.2--patch-20