Merge lp:~abentley/bzr-loom/merge into lp:bzr-loom

Proposed by Aaron Bentley on 2009-04-15
Status: Merged
Merge reported by: Vincent Ladeuil
Merged at revision: not available
Proposed branch: lp:~abentley/bzr-loom/merge
Merge into: lp:bzr-loom
Diff against target: None lines
To merge this branch: bzr merge lp:~abentley/bzr-loom/merge
Reviewer Review Type Date Requested Status
Loom Developers 2009-04-15 Pending
Review via email: mp+5591@code.launchpad.net
To post a comment you must log in.
Aaron Bentley (abentley) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch makes loom compatible with recent bzrs.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknmR1UACgkQ0F+nu1YWqI0wpQCggXWVDJwqcCYCvNije78kByT4
MpwAniF2ij31cq+yQgvQSv7kQg5G2Jgm
=JtD/
-----END PGP SIGNATURE-----

Robert Collins (lifeless) wrote :

Cool, doit
bb:approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'branch.py'
2--- branch.py 2009-02-28 11:02:28 +0000
3+++ branch.py 2009-04-15 20:04:03 +0000
4@@ -801,7 +801,7 @@
5 control_files.unlock()
6 return self.open(a_bzrdir, _found=True, )
7
8- def open(self, a_bzrdir, _found=False):
9+ def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
10 """Return the branch object for a_bzrdir
11
12 _found is a private parameter, do not use it. It is used to indicate
13@@ -816,7 +816,8 @@
14 return self._branch_class(_format=self,
15 _control_files=control_files,
16 a_bzrdir=a_bzrdir,
17- _repository=a_bzrdir.find_repository())
18+ _repository=a_bzrdir.find_repository(),
19+ ignore_fallbacks=ignore_fallbacks)
20
21 def take_over(self, branch):
22 """Take an existing bzrlib branch over into Loom format.

Subscribers

People subscribed via source and target branches

to all changes: