[MERGE] Implementation and tests for -r revno:N:path

Aaron Bentley aaron.bentley at utoronto.ca
Mon Jul 17 14:27:16 BST 2006


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


+        except NotBranchError:
+            # Don't raise an error when bzr diff is called from
+            # outside a working tree.
+            tree1, tree2 = None, None

This patch causes us to get a very bad error when plain 'bzr diff' is
run in an unversioned directory:

AttributeError: 'NoneType' object has no attribute 'basis_tree'

Previously, it produced:

bzr: ERROR: Not a branch: /home/abentley/bzrplugins/

I'd consider this a regression.

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

iD8DBQFEu5A00F+nu1YWqI0RAtSnAJ4p6Il3rpmQP0qc1Y3kIHAfD2QMqgCfZ5QT
3Ft8wBUajUfA7aEtOE4DYDg=
=KvhX
-----END PGP SIGNATURE-----




More information about the bazaar mailing list