Mercurial > hg
changeset 27625:cdb9493a7e2f
graft: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:46:06 +0000 |
| parents | d46db4390715 |
| children | 157675d0f600 |
| files | mercurial/cmdutil.py tests/test-graft.t tests/test-issue1175.t |
| diffstat | 3 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Dec 24 19:25:44 2015 +0000 +++ b/mercurial/cmdutil.py Thu Dec 24 20:46:06 2015 +0000 @@ -3364,6 +3364,8 @@ util.unlink(repo.join(f)) afterresolvedstates = [ + ('graftstate', + _('hg graft --continue')), ] def checkafterresolved(repo):
--- a/tests/test-graft.t Thu Dec 24 19:25:44 2015 +0000 +++ b/tests/test-graft.t Thu Dec 24 20:46:06 2015 +0000 @@ -246,6 +246,7 @@ $ echo b > e $ hg resolve -m e (no more unresolved files) + continue: hg graft --continue Continue with a revision should fail: @@ -440,6 +441,7 @@ $ echo b > a $ hg resolve -m a (no more unresolved files) + continue: hg graft --continue $ hg graft -c grafting 1:5d205f8b35b6 "1" $ hg export tip --git @@ -469,6 +471,7 @@ $ hg resolve --all merging a and b to b (no more unresolved files) + continue: hg graft --continue $ hg graft -c grafting 2:5c095ad7e90f "2" $ hg export tip --git @@ -759,6 +762,7 @@ $ echo abc > a $ hg resolve -m a (no more unresolved files) + continue: hg graft --continue $ hg graft -c grafting 28:50a516bb8b57 "28" $ cat a
--- a/tests/test-issue1175.t Thu Dec 24 19:25:44 2015 +0000 +++ b/tests/test-issue1175.t Thu Dec 24 20:46:06 2015 +0000 @@ -78,6 +78,7 @@ $ echo b3 >> b $ hg resolve --mark b (no more unresolved files) + continue: hg graft --continue $ hg graft --continue grafting 1:5974126fad84 "b1" warning: can't find ancestor for 'b' copied from 'a'!