Merge lp:~jelmer/brz/colo-switch-jml into lp:brz

[Jelmer Vernooij]

Fix switching to older revisions when creating a new branch.

Fix switching to older revisions when creating a new branch.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-11-04 15:48:54 +0000
+++ breezy/builtins.py	2018-11-11 21:57:02 +0000
@@ -6277,8 +6277,11 @@
                     gettext('cannot create branch without source branch'))
             to_location = lookup_new_sibling_branch(control_dir, to_location,
                  possible_transports=possible_transports)
+            if revision is not None:
+                revision = revision.as_revision_id(branch)
             to_branch = branch.controldir.sprout(to_location,
                  possible_transports=possible_transports,
+                 revision_id=revision,
                  source_branch=branch).open_branch()
         else:
             try:
@@ -6287,8 +6290,8 @@
             except errors.NotBranchError:
                 to_branch = open_sibling_branch(control_dir, to_location,
                     possible_transports=possible_transports)
-        if revision is not None:
-            revision = revision.as_revision_id(to_branch)
+            if revision is not None:
+                revision = revision.as_revision_id(to_branch)
         try:
             switch.switch(control_dir, to_branch, force, revision_id=revision,
                           store_uncommitted=store)

=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2018-07-13 00:24:33 +0000
+++ breezy/tests/blackbox/test_switch.py	2018-11-11 21:57:02 +0000
@@ -576,3 +576,30 @@
             $ brz branches
             * br1
             ''', null_output_matches_anything=True)
+
+    def test_switch_to_new_branch_on_old_rev(self):
+        """switch to previous rev in a standalone directory
+
+        Inspired by: https://bugs.launchpad.net/brz/+bug/933362
+        """
+        self.script_runner = script.ScriptRunner()
+        self.script_runner.run_script(self, '''
+           $ brz init
+           Created a standalone tree (format: 2a)
+           $ brz switch -b trunk
+           2>Tree is up to date at revision 0.
+           2>Switched to branch:...
+           $ brz commit -m 1 --unchanged
+           2>Committing to: ...
+           2>Committed revision 1.
+           $ brz commit -m 2 --unchanged
+           2>Committing to: ...
+           2>Committed revision 2.
+           $ brz switch -b blah -r1
+           2>Updated to revision 1.
+           2>Switched to branch:...
+           $ brz branches
+           * blah
+             trunk
+           $ brz st
+           ''')