fetch: do not count inactive branches when inferring a merge
The fetch extension would erroneously consider inactive branches when
inferring which branches to merge. It now considers only active
branches.
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch
% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
nothing changed
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@ 3 P0 tags: p0.patch qtip tip qbase
|
o 2 P1 tags: qparent
|
o 1 R1 tags:
|
o 0 C1 tags: