Rev 1434: Fix update of base tree. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk
Jelmer Vernooij
jelmer at samba.org
Fri Jul 4 07:41:44 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1434
revision-id: jelmer at samba.org-20080704064143-drswm948f45gra9i
parent: jelmer at samba.org-20080704064052-qbuje3mz3nkh1j6e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-07-04 08:41:43 +0200
message:
Fix update of base tree.
modified:
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-07-04 06:40:52 +0000
+++ b/workingtree.py 2008-07-04 06:41:43 +0000
@@ -572,11 +572,15 @@
if self.base_revid is None or self.base_revid == NULL_REVISION:
return self.branch.repository.revision_tree(self.base_revid)
+ if self.base_tree is None:
+ self.base_tree = SvnBasisTree(self)
+
return self.base_tree
def pull(self, source, overwrite=False, stop_revision=None,
delta_reporter=None, possible_transports=None):
# FIXME: Use delta_reporter
+ # FIXME: Use source
# FIXME: Use overwrite
result = PullResult()
result.source_branch = source
More information about the bazaar-commits
mailing list