At file:///home/jelmer/bzr/bzr-rebase/trunk/
------------------------------------------------------------
revno: 110
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Thu 2008-10-30 13:26:09 +0100
message:
Use parent location as default rather than pull location.
=== modified file 'NEWS'
--- a/NEWS 2008-09-01 17:51:22 +0000
+++ b/NEWS 2008-10-30 12:26:09 +0000
@@ -5,6 +5,8 @@
* Will automatically pull if it's not possible to rebase.
(#240204)
+ * Use parent location as default rather than push location.
+
0.4.1 2008-09-01
BUG FIXES
=== modified file '__init__.py'
--- a/__init__.py 2008-10-21 13:54:17 +0000
+++ b/__init__.py 2008-10-30 12:26:09 +0000
@@ -124,9 +124,7 @@
if pending_merges:
upstream_location = "."
else:
- upstream_location = wt.branch.get_push_location()
- if upstream_location is None:
- upstream_location = wt.branch.get_parent()
+ upstream_location = wt.branch.get_parent()
info("Rebasing on %s" % upstream_location)
upstream = Branch.open_containing(upstream_location)[0]
upstream_repository = upstream.repository
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
