Breezy

Merge lp:~jelmer/brz/devsubtree8 into lp:brz

  1. devsubtree8
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/devsubtree8
Merge into: lp:brz
Diff against target: 27 lines (+2/-4)
2 files modified
breezy/bzr/__init__.py (+1/-1)
breezy/tests/blackbox/test_reference.py (+1/-3)
To merge this branch: bzr merge lp:~jelmer/brz/devsubtree8
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+355877@code.launchpad.net

Commit message

Use BranchFormat8 (which supports storing references) in development-subtree.

Description of the change

Use BranchFormat8 (which supports storing references) in development-subtree.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/__init__.py'
2--- breezy/bzr/__init__.py 2018-09-21 02:03:52 +0000
3+++ breezy/bzr/__init__.py 2018-09-29 19:40:04 +0000
4@@ -291,7 +291,7 @@
5 'this format can only be read by bzr.dev. Please read '
6 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
7 'before use.',
8- branch_format='breezy.bzr.branch.BzrBranchFormat7',
9+ branch_format='breezy.bzr.branch.BzrBranchFormat8',
10 tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
11 experimental=True,
12 hidden=True,
13
14=== modified file 'breezy/tests/blackbox/test_reference.py'
15--- breezy/tests/blackbox/test_reference.py 2018-07-07 15:06:42 +0000
16+++ breezy/tests/blackbox/test_reference.py 2018-09-29 19:40:04 +0000
17@@ -27,9 +27,7 @@
18 class TestReference(TestCaseWithTransport):
19
20 def get_default_format(self):
21- format = controldir.format_registry.make_controldir('1.9')
22- format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
23- return format
24+ return controldir.format_registry.make_controldir('development-subtree')
25
26 def test_no_args_lists(self):
27 branch = self.make_branch('branch')

Subscribers

People subscribed via source and target branches