[MERGE] migrate switch command into the core
Aaron Bentley
aaron.bentley at utoronto.ca
Thu Nov 22 06:28:46 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ian Clatworthy wrote:
> The revised patch is attached. As well as cleaning up the issues Aaron
> raised (see below), the code now has David's name back in as an author
> (on his request) and fails cleanly if pending merges are found.
# target_branch: file:///home/ian/bzr/repo.knits/bzr.dev/
^ dude, set up a public location for that.
+def switch(control_dir, to_branch):
+ """Switch the branch associated with a checkout.
+
+ :param control_dir: BzrDir of the checkout to change
+ :param to_branch: branch that the checkout is to be bound to
^^^ I think "bound" is a confusing term if the branch may not actually
be bound.
+def _set_branch_location(control, to_branch):
+ """Set location value of a branch reference.
+
+ :param control: BzrDir of the checkout to change
+ :param to_branch: branch that the checkout is to be bound to.
^^^ And it's even worse when we're certain the branch will not be bound.
=== modified file 'bzrlib/tests/blackbox/__init__.py'
- --- bzrlib/tests/blackbox/__init__.py 2007-10-24 05:47:39 +0000
+++ bzrlib/tests/blackbox/__init__.py 2007-11-21 15:10:44 +0000
@@ -101,6 +101,7 @@
'bzrlib.tests.blackbox.test_sign_my_commits',
'bzrlib.tests.blackbox.test_split',
'bzrlib.tests.blackbox.test_status',
+ 'bzrlib.tests.blackbox.test_switch',
It looks to me like you didn't actually commit blackbox/test_switch.py
bb:resubmit because the blackbox test is missing.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHRSGe0F+nu1YWqI0RApIKAJ4mX4SjhCLpWikKDbfm2JtFSXpy/wCfcG2+
EZ1bX5s6B38G2RAW57Y4SPI=
=biTO
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list