Mercurial > hg
comparison tests/test-backout.t @ 27624:d46db4390715
resolve: suggest the next action
Expose afterresolvedstates to allow graft and similar to
suggest a message when resolving results in no unresolved
files.
If there isn't a matching state in afterresolvedstates,
then if verbose, suggest commiting.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 19:25:44 +0000 |
| parents | 296d55def9c4 |
| children | ce76c4d2b85c |
comparison
equal
deleted
inserted
replaced
| 27623:b3376fba4ab9 | 27624:d46db4390715 |
|---|---|
| 712 picked tool ':merge' for foo (binary False symlink False changedelete False) | 712 picked tool ':merge' for foo (binary False symlink False changedelete False) |
| 713 merging foo | 713 merging foo |
| 714 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 | 714 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
| 715 premerge successful | 715 premerge successful |
| 716 (no more unresolved files) | 716 (no more unresolved files) |
| 717 continue: hg commit | |
| 717 $ hg status | 718 $ hg status |
| 718 M foo | 719 M foo |
| 719 ? foo.orig | 720 ? foo.orig |
| 720 $ hg resolve -l | 721 $ hg resolve -l |
| 721 R foo | 722 R foo |