Merge lp:~jelmer/brz/user-url into lp: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:~jelmer/brz/user-url |
Merge into: | lp:brz |
Prerequisite: | lp:~jelmer/brz/lock-breaking |
Diff against target: |
212 lines (+22/-25) 12 files modified
breezy/branch.py (+1/-1) breezy/info.py (+2/-2) breezy/tests/blackbox/test_branch.py (+1/-1) breezy/tests/blackbox/test_init.py (+1/-1) breezy/tests/per_branch/test_branch.py (+2/-5) breezy/tests/per_branch/test_http.py (+1/-1) breezy/tests/per_branch/test_sprout.py (+1/-1) breezy/tests/per_controldir/test_controldir.py (+4/-6) breezy/tests/per_controldir_colo/test_supported.py (+2/-2) breezy/tests/per_interbranch/test_pull.py (+6/-1) breezy/tests/per_workingtree/test_smart_add.py (+1/-1) breezy/tests/per_workingtree/test_workingtree.py (+0/-3) |
To merge this branch: | bzr merge lp:~jelmer/brz/user-url |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | Approve | ||
Review via email: mp+340567@code.launchpad.net |
Commit message
Consistently use Branch.user_url when referring to branch location.
Description of the change
Consistently use Branch.user_url when referring to branch location.
Previously, some code assumed that the branches' control directory's transport base would be at the same location, but that is not necessarily true in git.
To post a comment you must log in.
Looks good.