Submitter | Shusen LIU |
---|---|
Date | Jan. 27, 2016, 12:14 a.m. |
Message ID | <353420302daf4529e72e.1453853665@dev1221.lla1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/12892/ |
State | Deferred |
Delegated to: | Pierre-Yves David |
Headers | show |
Comments
Patch
diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -3805,3 +3805,8 @@ tr.close() finally: release(tr, lock, wlock) # reverse order + +@eh.uisetup +def _setupafterresolvedstateshook(ui): + cmdutil.afterresolvedstates.append( + ['evolvestate', _('hg evolve --continue')]) diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t +++ b/tests/test-stabilize-conflict.t @@ -165,6 +165,7 @@ $ safesed 's/dix/ten/' babar $ hg resolve --all -m (no more unresolved files) + continue: hg evolve --continue $ hg evolve --continue evolving 5:71c18f70c34f "babar count up to fifteen" $ hg resolve -l diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t +++ b/tests/test-stabilize-result.t @@ -102,6 +102,7 @@ [255] $ hg resolve -m a (no more unresolved files) + continue: hg evolve --continue $ hg evolve --continue evolving 5:3655f0f50885 "newer a"