[MERGE REVIEW] Merge against '.' works properly

[Aaron Bentley]

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

Robert Collins wrote:
| On Sun, 2006-03-12 at 20:59 -0500, Aaron Bentley wrote:
|
|>-            raise Exception("can't fetch from a branch to itself %s,
|>%s" %
|>-                            (self.base, to_branch.base))
|>+            raise errors.CantFetchSelf(self)
|
|
|
| I think this should be a no-op rather than raising an exception. What do
| you think?

Fine with me, here's a patch that does that.

Or see http://code.aaronbentley.com/bzr/bzrrepo/bzr.mergeself/

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

iD8DBQFEHJvN0F+nu1YWqI0RAmnQAJ9WyC2WOnKjDkBiaTTWjv+rV2Z3UgCfTngX
WBDBALsIEMTTeXw8t2qWNHw=
=ke+j
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergedot2.patch
Type: text/x-patch
Size: 2536 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060318/bfe5f185/attachment.bin