Mercurial > evolve
changeset 3414:3a7cf3966182 stable
branching: merge more compatibility fix into stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 16 Jan 2018 01:18:05 +0100 |
| parents | 0c4967f60eeb (current diff) b96568036837 (diff) |
| children | fb18c54b4d49 |
| files | tests/test-evolve-topic.t |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py Mon Jan 15 21:47:40 2018 +0100 +++ b/hgext3rd/evolve/obshistory.py Tue Jan 16 01:18:05 2018 +0100 @@ -524,8 +524,7 @@ firstline = True for chunk, label in patch.diffui(repo, node, succ, matchfn, changes=None, opts=diffopts, - prefix='', relroot='', - hunksfilterfn=None): + prefix='', relroot=''): if firstline: fm.plain('\n') firstline = False
--- a/tests/test-evolve-topic.t Mon Jan 15 21:47:40 2018 +0100 +++ b/tests/test-evolve-topic.t Tue Jan 16 01:18:05 2018 +0100 @@ -248,9 +248,9 @@ | o 0 - {} 199cc73e9a0b add aaa (draft) - $ hg topic -r 13 bar + $ hg topic -r 070c5573d8f9 bar changed topic on 1 changes - $ hg up 14 + $ hg up 16d6f664b17c switching to topic bar 2 files updated, 0 files merged, 0 files removed, 0 files unresolved