Rev 105: Rebase if we can't pull. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 105
revision-id: jelmer at samba.org-20080901175122-lf1xi0md2yhudwd5
parent: jelmer at samba.org-20080901151233-9jkac3hfy3g18if6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 19:51:22 +0200
message:
  Rebase if we can't pull.
modified:
  NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
  test_blackbox.py               test_blackbox.py-20070709202607-dyvt95dfu09tuv6a-1
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 15:12:33 +0000
+++ b/NEWS	2008-09-01 17:51:22 +0000
@@ -1,3 +1,10 @@
+0.4.2	UNRELEASED
+
+ FEATURES
+
+  * Will automatically pull if it's not possible to rebase. 
+    (#240204)
+
 0.4.1	2008-09-01
 
  BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2008-09-01 15:12:33 +0000
+++ b/__init__.py	2008-09-01 17:51:22 +0000
@@ -187,7 +187,8 @@
                     return
                 if not our_new:
                     self.outf.write("Base branch is descendant of current "
-                        "branch. Use 'bzr pull'.\n")
+                        "branch. Pulling instead.\n")
+                    wt.pull(upstream, onto)
                     return
             # else: include extra revisions needed to make start_revid mean
             # something.

=== modified file 'test_blackbox.py'
--- a/test_blackbox.py	2008-07-19 08:08:45 +0000
+++ b/test_blackbox.py	2008-09-01 17:51:22 +0000
@@ -56,7 +56,9 @@
         self.run_bzr('add')
         self.run_bzr('commit -m bloe')
         os.chdir('../feature')
-        self.check_output("Base branch is descendant of current branch. Use 'bzr pull'.\n", 'rebase ../main')
+        self.check_output("Base branch is descendant of current branch. Pulling instead.\n", 'rebase ../main')
+        self.assertEquals(Branch.open("../feature").revision_history(), 
+                          Branch.open("../main").revision_history())
 
     def test_no_pending_merges(self):
         self.run_bzr_error(['bzr: ERROR: No pending merges present.\n'], 'rebase --pending-merges')