[MERGE REVIEW] Merge against '.' works properly

[Aaron Bentley]

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

Hi all,

This patch fixes handling of merge with the cwd as the merge source.
Why?  Because it's a great way to revert changes.  If you're at revision
10, and you realize revision 6 was bad:

1. You don't want to uncommit, because you lose the other changes
2. You don't want to uncommit, because if you ever merge someone who has
those changes, they'll come back.

Instead, you do "bzr merge . -r 6..5"

This patch also fixes error handling when you try to fetch from a branch
to itself.

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

iD8DBQFEFNH30F+nu1YWqI0RAoV5AJsGbpYjLrqT7CT7Mv2lgJBX1DYiqwCeNHtv
Llvo+BotKCDCMzvcAFSSrpY=
=v+8F
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergedot.patch
Type: text/x-patch
Size: 2603 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060312/25e8bf84/attachment.bin