466   $ hg evolve --all --traceback

   466   $ hg evolve --all --traceback

   467   move:[8] dansk 2!

   467   move:[8] dansk 2!

   468   atop:[10] dansk!

   468   atop:[10] dansk!

   469   merging main-file-1

   469   merging main-file-1

   470   move:[9] dansk 3!

   470   move:[9] dansk 3!

   472   merging main-file-1

   471   merging main-file-1

   473   working directory is now at 96abb1319a47

   472   working directory is now at 96abb1319a47

   474   $ hg log -G

   473   $ hg log -G

   475   @  12	: dansk 3! - test

   474   @  12	: dansk 3! - test

   476   |

   475   |

  1289   [2]

  1288   [2]

  1290   $ hg evolve --all --any

  1289   $ hg evolve --all --any

  1291   move:[20] add j2

  1290   move:[20] add j2

  1292   atop:[23] add j1

  1291   atop:[23] add j1

  1293   move:[21] add j3

  1292   move:[21] add j3

  1295   working directory is now at 0d9203b74542

  1293   working directory is now at 0d9203b74542

  1296   $ glog -r "0cf3707e8971::"

  1294   $ glog -r "0cf3707e8971::"

  1297   @  25:0d9203b74542@default(draft) add j3

  1295   @  25:0d9203b74542@default(draft) add j3

  1298   |

  1296   |

  1299   o  24:f1b85956c48c@default(draft) add j2

  1297   o  24:f1b85956c48c@default(draft) add j2

  1463 

  1461 

  1464   $ hg evolve --rev "98c7ab460e6b::"

  1462   $ hg evolve --rev "98c7ab460e6b::"

  1465   move:[35] will be evolved safely

  1463   move:[35] will be evolved safely

  1466   atop:[37] amended

  1464   atop:[37] amended

  1467   move:[36] will cause conflict at evolve

  1465   move:[36] will cause conflict at evolve

  1469   merging newfile

  1466   merging newfile

  1470   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')

  1467   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')

  1471   fix conflicts and see `hg help evolve.interrupted`

  1468   fix conflicts and see `hg help evolve.interrupted`

  1472   [1]

  1469   [1]

  1473 

  1470