Breezy

Merge lp:~jelmer/brz/fix-wt2 into lp:brz/3.1

  1. fix-wt2
  2. Merge into 3.1
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/fix-wt2
Merge into: lp:brz/3.1
Diff against target: 11 lines (+1/-1)
1 file modified
breezy/repository.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/fix-wt2
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+386854@code.launchpad.net

Commit message

Fix tests for WorkingTree2.

Description of the change

Fix tests for WorkingTree2.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/repository.py'
2--- breezy/repository.py 2020-06-28 19:19:25 +0000
3+++ breezy/repository.py 2020-07-04 13:12:31 +0000
4@@ -1535,7 +1535,7 @@
5 try:
6 self.target.set_make_working_trees(
7 self.source.make_working_trees())
8- except NotImplementedError:
9+ except (NotImplementedError, errors.RepositoryUpgradeRequired):
10 pass
11 self.target.fetch(self.source, revision_id=revision_id)
12

Subscribers

People subscribed via source and target branches