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

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.3--patch-76

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

    Summary:
      bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.
    Revision:
      bazaar--devo--1.3--patch-76

    Patches applied:
    
     * jblack at gnuarch.org--2005/baz--authentication--1.3--patch-12
       Merge from upstream
    
     * jblack at gnuarch.org--2005/baz--authentication--1.3--patch-13
       Wrote a parser so that authinfo can handle quotes. (My first parser ever)
    
     * lord at emf.net--2005/tla--devo--1.3.2--patch-6
       [CLOSE inode-sig]
    
     * lord at seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
       tag of lord at emf.net--2005/tla--devo--1.3.2--patch-5
    
     * lord at seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
       tag of lord at seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
    
     * lord at seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
       [CLOSE sandia-jjengland/inode-sig]
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-12
       merge in inode-sigs hide permission changes bugfix from tla 1.3.2
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-13
       merge thelove
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-14
       add test for three way merging when tagging rules change
    
     * robert.collins at canonical.com--general/bazaar--devel--1.4--patch-15
       bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.
    
     * thelove at canonical.com/bazaar--devo--1.4--patch-10
       revert latest thelove sftp patch - breaks on some systems
    
     * thelove at canonical.com/bazaar--devo--1.4--patch-12
       fix memory leak in authinfo support
    
     * thelove at canonical.com/bazaar--devo--1.4--patch-13
       Wrote a parser so that authinfo can handle quotes. 
    

    modified files:
     libarch/apply-changeset.c libarch/diffs.c libarch/diffs.h
     libarch/make-changeset.c tests/test-merge.sh

    new patches:
     jblack at gnuarch.org--2005/baz--authentication--1.3--patch-12
     jblack at gnuarch.org--2005/baz--authentication--1.3--patch-13
     lord at emf.net--2005/tla--devo--1.3.2--patch-6
     lord at seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
     lord at seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
     lord at seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-12
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-13
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-14
     robert.collins at canonical.com--general/bazaar--devel--1.4--patch-15
     thelove at canonical.com/bazaar--devo--1.3--patch-76
     thelove at canonical.com/bazaar--devo--1.4--patch-10
     thelove at canonical.com/bazaar--devo--1.4--patch-12
     thelove at canonical.com/bazaar--devo--1.4--patch-13