Submitter | phabricator |
---|---|
Date | Aug. 16, 2017, 6:33 a.m. |
Message ID | <2e4a2eca585e8a71ca9086487ba51a69@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/23080/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -916,12 +916,13 @@ |/ |/ A A """ + # pick already rebased revs from state + source = [s for s, d in state.items() if d > 0] + result = [] for prev in repo.changelog.parentrevs(rev): adjusted = dest if prev != nullrev: - # pick already rebased revs from state - source = [s for s, d in state.items() if d > 0] candidate = repo.revs('max(%ld and (::%d))', source, prev).first() if candidate is not None: adjusted = state[candidate]