Merge lp://staging/~jelmer/brz/switch-self into lp://staging/brz
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://staging/~jelmer/brz/switch-self | ||||||||
| Merge into: | lp://staging/brz | ||||||||
| Diff against target: |
187 lines (+93/-6) 7 files modified
breezy/builtins.py (+8/-2) breezy/bzr/branch.py (+13/-3) breezy/bzr/bzrdir.py (+3/-0) breezy/controldir.py (+8/-0) breezy/tests/blackbox/test_checkout.py (+1/-1) breezy/tests/blackbox/test_switch.py (+47/-0) breezy/tests/per_controldir_colo/test_supported.py (+13/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/switch-self | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
Commit message
Two switch fixes (relative paths in lightweight checkout URLs of colocated branches (#919169), print error when attempting to create a branch reference loop (#1018628))
Description of the change
Two colocated branch fixes:
* Use relative paths in lightweight checkout URLs of colocated branches (#919169)
* Print an error when attempting to create a branch reference loop (#1018628)
To post a comment you must log in.
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank you! Great to fix some of these gotchas with colo branches and switch.