Merge lp:~jelmer/brz/branches-url into lp:brz

Proposed by Jelmer Vernooij on 2018-03-05
Status: Merged
Approved by: Jelmer Vernooij on 2018-03-05
Approved revision: 6877
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/branches-url
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/builtins.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/branches-url
Reviewer Review Type Date Requested Status
Martin Packman 2018-03-05 Approve on 2018-03-05
Review via email: mp+340765@code.launchpad.net

Commit message

Compare user_url branch attribute in cmd_branches, when finding active branch.

Description of the change

Compare user_url branch attribute in cmd_branches, when finding active branch.

To post a comment you must log in.
Martin Packman (gz) wrote :

Did this cause a test to fail, or is it just a correctness change?

review: Approve
Jelmer Vernooij (jelmer) wrote :

> Did this cause a test to fail, or is it just a correctness change?
This is a correctness fix. It does change the behaviour for "bzr branches", but just for git branches. I'm adding a separate test in brz-git.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/builtins.py'
2--- breezy/builtins.py 2018-03-02 00:38:34 +0000
3+++ breezy/builtins.py 2018-03-05 21:12:44 +0000
4@@ -1652,7 +1652,7 @@
5 if name == "":
6 continue
7 active = (active_branch is not None and
8- active_branch.base == branch.base)
9+ active_branch.user_url == branch.user_url)
10 names[name] = active
11 # Only mention the current branch explicitly if it's not
12 # one of the colocated branches

Subscribers

People subscribed via source and target branches