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

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

    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.4--patch-18

    Patches applied:
    
     * 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.
    

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

    new patches:
     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.4--patch-18