Mercurial > hg
diff tests/test-graft.t @ 38155:5736570718fe
graft: drop --user and --date values info from hint in case of conflicts
After previous patch, we have started preserving user and date values in
graftstate and reusing them during `hg graft --continue`. Now passing --user and
--date again with --continue makes no sense. Let's drop them from the hint.
Differential Revision: https://phab.mercurial-scm.org/D3660
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 26 May 2018 02:11:09 +0530 |
parents | decdb587ea12 |
children | 66fc2ef8dbff |
line wrap: on
line diff
--- a/tests/test-graft.t Fri May 25 17:21:01 2018 +0530 +++ b/tests/test-graft.t Sat May 26 02:11:09 2018 +0530 @@ -1456,7 +1456,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue - (use 'hg resolve' and 'hg graft --continue --user batman') + (use 'hg resolve' and 'hg graft --continue') [255] $ echo wat > b @@ -1506,7 +1506,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue - (use 'hg resolve' and 'hg graft --continue --date '1234560000 120'') + (use 'hg resolve' and 'hg graft --continue') [255] $ echo foobar > b