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

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.4--patch-25

2005-04-21 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-25

    Summary:
      Fix for resolved. The command was tricked by all but the simplest user input. Fix resolved help. Took errant echo out of add test case
    Revision:
      bazaar--devo--1.4--patch-25

    Patches applied:
    
     * jblack at gnuarch.org--2005/baz--resolved--1.4--base-0
       tag of thelove at canonical.com/bazaar--devo--1.4--patch-24
    
     * jblack at gnuarch.org--2005/baz--resolved--1.4--patch-1
       Fixing resolved so it actually resolves (user input tricked it in all but the most trivial cases
    
     * jblack at gnuarch.org--2005/baz--resolved--1.4--patch-2
       fixing resolved help
    

    modified files:
     commands/resolved.c libarch/conflict-handling.c
     tests/test-add.sh

    new patches:
     jblack at gnuarch.org--2005/baz--resolved--1.4--base-0
     jblack at gnuarch.org--2005/baz--resolved--1.4--patch-1
     jblack at gnuarch.org--2005/baz--resolved--1.4--patch-2
     thelove at canonical.com/bazaar--devo--1.4--patch-25