Merge lp:~spiv/bzr/cross-format-stacking-fetch-562380-2.0 into lp:bzr/2.0
Proposed by
Andrew Bennetts
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~spiv/bzr/cross-format-stacking-fetch-562380-2.0 | ||||
Merge into: | lp:bzr/2.0 | ||||
Diff against target: |
139 lines (+40/-5) 5 files modified
NEWS (+6/-0) bzrlib/remote.py (+12/-0) bzrlib/tests/per_repository_reference/__init__.py (+17/-0) bzrlib/tests/per_repository_reference/test_default_stacking.py (+0/-1) bzrlib/tests/test_remote.py (+5/-4) |
||||
To merge this branch: | bzr merge lp:~spiv/bzr/cross-format-stacking-fetch-562380-2.0 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+23987@code.launchpad.net |
Commit message
Don't allow RemoteRepository to stack on an incompatible-format repository. (#562380)
Description of the change
Backport to 2.0 of <https:/
To post a comment you must log in.
This can't merge by pqm, same root cause as jam's one:
test_selftest. TestSelftest. test_runner_ class ERROR 9ms TestResultDecor ator' object has no attribute 'done'
'AutoTiming
======= ======= ======= ======= ======= ======= ======= ======= ======= ======= tests.test_ selftest. TestSelftest) ------- ------- ------- ------- ------- ------- ------- ------- ------- local/Users/ vila/src/ bzr/integration /2.0/bzrlib/ tests/test_ selftest. py", line 1845, in test_runner_class suite_factory= self.factory) local/Users/ vila/src/ bzr/integration /2.0/bzrlib/ tests/test_ selftest. py", line 1772, in run_selftest assertEqual( True, tests.selftest( stream= output, **kwargs)) local/Users/ vila/src/ bzr/integration /2.0/bzrlib/ tests/_ _init__ .py", line 3261, in selftest local/Users/ vila/src/ bzr/integration /2.0/bzrlib/ tests/_ _init__ .py", line 2815, in run_suite ResultDecorator ' object has no attribute 'done'
ERROR: test_runner_class (bzrlib.
-------
Traceback (most recent call last):
File "/net/bigmamac.
test_
File "/net/bigmamac.
self.
File "/net/bigmamac.
stream=stream,
File "/net/bigmamac.
result.done()
AttributeError: 'AutoTimingTest
------- ------- ------- ------- ------- ------- ------- ------- ------- -------
Ran 21905 tests in 2064.942s
FAILED (errors=1, known_failure_ count=30)