Merge lp:~jelmer/brz/push-uses-sprout into lp:brz

[Jelmer Vernooij]

Use sprout rather than clone when creating a copy of a branch in a controldir.

Use sprout rather than clone when creating a copy of a branch in a controldir.

This is necessary in the case where the target controldir is incompatible with
the source branch format. (e.g. pushing from bzr to git or vice versa)

[Martin Packman (gz)]

Okay, implementation differences here all a bit complex, but seems sane enough.

review: Approve

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2017-11-28 17:13:29 +0000
+++ breezy/controldir.py	2018-03-04 19:18:46 +0000
@@ -415,7 +415,7 @@
                 # revision
                 revision_id = source.last_revision()
             repository_to.fetch(source.repository, revision_id=revision_id)
-            br_to = source.clone(self, revision_id=revision_id)
+            br_to = source.sprout(self, revision_id=revision_id)
             if source.get_push_location() is None or remember:
                 # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
                 source.set_push_location(br_to.base)