Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-continue.t
changeset 4501 73ef37904b07
parent 4428 fe37721aa0d9
child 4505 cc2bbe2701a3
equal deleted inserted replaced
4500:cfcb7eedc666 4501:73ef37904b07 
   304 
   304 
   305   $ echo foo > g
 
   305   $ echo foo > g
 
   306   $ hg resolve -m
 
   306   $ hg resolve -m
 
   307   (no more unresolved files)
 
   307   (no more unresolved files)
 
   308   continue: hg evolve --continue
 
   308   continue: hg evolve --continue
 
   309 
       
   310 XXX: this should have asked for confirmation
 
       
   311 
   309 
   312   $ hg evolve --continue<<EOF
 
   310   $ hg evolve --continue<<EOF
 
   313   > y
 
   311   > y
 
   314   > EOF
 
   312   > EOF
 
   315   evolving 19:981e615b14ca "added g"
 
   313   evolving 19:981e615b14ca "added g"
evolve