At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3848
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Tue 2008-11-25 02:18:10 +0000
message:
(Marius,
Martin) Avoid breaking API when retrieving master branch nickname.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3815.3.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Marius Kruger <[EMAIL PROTECTED]>
branch nick: bzr.1.9
timestamp: Sun 2008-11-16 00:12:26 +0200
message:
apply Martin's fix for #293440
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2008-10-30 03:56:00 +0000
+++ b/bzrlib/branch.py 2008-11-15 22:12:26 +0000
@@ -155,7 +155,7 @@
master = self.get_master_branch(possible_transports)
if master is not None:
# return the master branch value
- config = master.get_config()
+ return master.nick
except errors.BzrError, e:
# Silently fall back to local implicit nick if the master is
# unavailable
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
