[MERGE] Enhance conflicts when OTHER deletes a needed directory

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The problem with conflict messages is that they try to be symmetrical.

This works out rather badly when OTHER tries to delete a file, and THIS
has added files to it.  You get:
"Conflict adding files to foo.  Not deleting."  "Conflict adding files"
would make sense in the other direction, i.e. merging THIS into OTHER.
But merging OTHER into THIS, the problem is deleting a directory without
deleting all its children.

This patch changes the message to "Conflict deleting parent directory
foo because it has children.  Not deleting."

This fixes bug # 47764
https://launchpad.net/products/bzr/+bug/47764

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE/jdT0F+nu1YWqI0RAnQEAJoCsfTv1Yk3dfv1V3rRvaLJHbfl8wCfeG8E
fHRl9Kx3WodaKRDslf6ET+c=
=WtFF
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: improved-conflicts.patch
Type: text/x-patch
Size: 9668 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060905/8a35d071/attachment.bin