At http://bzr.debian.org/pkg-bazaar/bzr-rebase/experimental
------------------------------------------------------------
revno: 46
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-10-09 18:27:32 +0200
message:
Package new upstream snapshot.
modified:
NEWS news-20070721005510-kbjm9yxqoeczq9fl-1
__init__.py __init__.py-20070626215909-fi0s39bkwxn4gcto-1
debian/changelog changelog-20070714212400-6fqzhl97r51iwf29-1
maptree.py maptree.py-20070709163407-quin1nc7pd9bp2mo-1
test_blackbox.py
test_blackbox.py-20070709202607-dyvt95dfu09tuv6a-1
------------------------------------------------------------
revno: 24.1.82
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Thu 2008-10-09 18:25:33 +0200
message:
Provide get_file_with_stat.
modified:
maptree.py
maptree.py-20070709163407-quin1nc7pd9bp2mo-1
------------------------------------------------------------
revno: 24.1.81
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
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 'debian/changelog'
--- a/debian/changelog 2008-09-01 15:14:27 +0000
+++ b/debian/changelog 2008-10-09 16:27:32 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.4.1+bzr106-1) experimental; urgency=low
+
+ * Package upstream snapshot that includes fix for compatibility with bzr 1.8.
+
+ -- Jelmer Vernooij <[EMAIL PROTECTED]> Thu, 09 Oct 2008 18:26:40 +0200
+
bzr-rebase (0.4.1-1) experimental; urgency=low
* New upstream release.
=== modified file 'maptree.py'
--- a/maptree.py 2008-05-11 18:52:36 +0000
+++ b/maptree.py 2008-10-09 16:25:33 +0000
@@ -116,6 +116,10 @@
return self.oldtree.get_file_sha1(file_id=self.old_id(file_id),
path=path)
+ def get_file_with_stat(self, file_id, path=None):
+ return self.oldtree.get_file_with_stat(file_id=self.old_id(file_id),
+ path)
+
def get_file(self, file_id, path=None):
if path is None:
return self.oldtree.get_file(self.old_id(file_id=file_id))
=== 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')
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
