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

2005-05-27 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-68

    Summary:
      resolved internal api tweaks, and slight ui planing. Fixes reported issue with resolved not resolving
    Revision:
      bazaar--devo--1.4--patch-68

    Patches applied:
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-103
       factor command line path selection out into arch_paths_from_user for resolved and annotate. Convert arch_unconflict files from a bitfield return to a enum return. Make resolved return an error when a non existent file is requested by the user
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-104
       fix occasional problems with resolved not finding the conflicted file by correctly escaping file names on output and unescaping on input, allowing comparison of canonical strings not escaped ones
    

    modified files:
     commands/annotate.c commands/cmdutils.c commands/cmdutils.h
     commands/resolved.c libarch/conflict-handling.c
     libarch/conflict-handling.h tests/test-conflicts.sh

    new patches:
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-103
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-104
     thelove at canonical.com/bazaar--devo--1.4--patch-68