Merge lp://staging/~tzeentch-gm/bzr-colo/1044975-remote-cw-base-fix into lp://staging/bzr-colo
Proposed by
Michael Gliwinski
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~tzeentch-gm/bzr-colo/1044975-remote-cw-base-fix |
| Merge into: | lp://staging/bzr-colo |
| Diff against target: |
23 lines (+5/-1) 1 file modified
colocated.py (+5/-1) |
| To merge this branch: | bzr merge lp://staging/~tzeentch-gm/bzr-colo/1044975-remote-cw-base-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Neil Martinsen-Burrell | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes the problem described in #1044975
The bug only occurs when using a remote URL (i.e. non-localhost) so I'm not sure how to test it. Let me know if you have any suggestions and if this approach is OK (all existing tests pass for me).
To post a comment you must log in.
Unmerged revisions
- 121. By Michael Gliwinski
-
Consider a remote ColocatedWorkspace as having no working tree.
Otherwise the remote working tree's branch is used to calculate repo location, but since the tree references this branch with a local (file:) URL, this causes repo_location to be a file: URL where it should be remote.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
