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

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

    Summary:
      Files based resolved (if you get conflicts this is where)
    Revision:
      bazaar--devo--1.2--patch-7

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--base-0
       tag of thelove at canonical.com/bazaar--devo--1.2--patch-3
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-1
       Fixed typo. arch_conflicts_occurred, not arch_conflicts_occured. Did I really do this?
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-2
       Baz conflict code now records what conflicted
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-3
       Now I list the files that are conflicted
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-4
       Baz resolved now works. Just a few outstanding things remain
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-5
       All that's needed is the tests fixed
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-6
       Fixing merge test I broke
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-7
       Added one more pre-merge test for baz merge
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-8
       Fixing up the reject code for final form
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-9
       Star merged thelove to resolve conflicts
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-10
       Changing a test case so that it runs with pqm like on the local machine
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-11
       ANOTHER test case fix. :)
    

    new files:
     libarch/conflict-handling.c libarch/conflict-handling.h
     tests/.arch-ids/test-conflicts.sh.id tests/test-conflicts.sh

    modified files:
     commands/apply-changeset.c commands/apply-delta.c
     commands/commit.c commands/redo.c commands/replay.c
     commands/resolved.c commands/status.c commands/switch.c
     commands/undo.c commands/update.c libarch/apply-changeset.c
     libarch/apply-changeset.h libarch/build-revision.c
     libarch/commit.c libarch/library-txn.c
     libarch/merge-three-way.c libarch/merge.c
     libarch/proj-tree-lint.c libarch/proj-tree-lint.h
     libarch/replay.c tests/Makefile.in

    new patches:
     jblack at gnuarch.org--2004/baz--resolve--1.2--base-0
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-1
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-2
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-3
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-4
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-5
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-6
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-7
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-8
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-9
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-10
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-11
     thelove at canonical.com/bazaar--devo--1.2--patch-7