comparison tests/test-evolve.t @ 3359:ae6fddf39933

test: update output to 9b3f95d9783d

The unstable graph nodes are now shown with the character "*", update the test
outputs.

CORE-TEST-OUTPUT-UPDATE: 9b3f95d9783d

3358:81aae43ee0f1

  0	: base - test
  $ hg up -q 0
  $ glog --hidden
  o  4:ba0ec09b1bab@default(draft) a nifty feature
  |
  | o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
  | |
  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
  | |/
  | x  1:568a468b60fc@default(draft) a nifty feature
  |/

(ninja test for the {trouble} template:

  $ hg log -G --template '{rev} {troubles}\n'
  @  10
  |
  | o  9 orphan
  | |
  | o  8 orphan
  | |
  | x  7
  |/
  o  5
  |

  $ hg up -r "desc('a2')"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  9 [default] a1__
  |
  | o  8 [mybranch] a3
  | |
  | @  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  $ glog
  @  10:d952e93add6f@mybranch(draft) a2
  |
  o  9:9f8b83c2e7f3@default(draft) a1__
  |
  | o  8:777c26ca5e78@mybranch(draft) a3
  | |
  | x  7:eb07e22a0e63@mybranch(draft) a2
  | |
  | x  6:faafc6cea0ba@default(draft) a1_
  |/

  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  10 [mybranch] a2
  |
  @  9 [default] a1__
  |
  | o  8 [mybranch] a3
  | |
  | x  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | o  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | o  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  $ hg amend
  2 new orphan changesets
  $ glog
  @  16:edc3c9de504e@default(draft) a3
  |
  | o  15:beb41503aa3e@default(draft) add gh
  | |
  | | o  14:27247fcb2df6@default(draft) add gg
  | |/
  | x  13:cce26b684bfe@default(draft) a3
  |/
  o  12:f15d32934071@default(draft) bumped update to d952e93add6f:
  |

  $ hg amend
  2 new orphan changesets
  $ glog -r "edc3c9de504e::"
  @  22:8dc373be86d9@default(draft) add j1
  |
  | o  21:d7eadcf6eccd@default(draft) add j3
  | |
  | o  20:2223ea564144@default(draft) add j2
  | |
  | x  19:48490698b269@default(draft) add j1
  |/
  | o  18:e02107f98737@default(draft) add gh
  | |

  new changeset is empty
  (use 'hg prune .' to remove it)
  $ glog -r "edc3c9de504e::"
  @  23:044804d0c10d@default(draft) add j1
  |
  | o  21:d7eadcf6eccd@default(draft) add j3
  | |
  | o  20:2223ea564144@default(draft) add j2
  | |
  | x  19:48490698b269@default(draft) add j1
  |/
  | o  18:e02107f98737@default(draft) add gh
  | |

  $ glog -r "edc3c9de504e::"
  @  32:7a555adf2b4a@default(draft) _pp
  |
  o  31:2be4d2d5bf34@default(draft) _oo
  |
  | o  30:53f0c003e03e@default(draft) add uu
  | |
  | x  29:1bf2152f4f82@default(draft) oo+pp
  |/
  | o  28:580886d07058@default(draft) add gg
  | |

  $ glog -r "43c3f5ef149f::" --hidden
  @  38:c904da5245b0@default(draft) will be evolved safely
  |
  o  37:34ae045ec400@default(draft) amended
  |
  | o  36:02e943732647@default(draft) will cause conflict at evolve
  | |
  | x  35:f8e30e9317aa@default(draft) will be evolved safely
  | |
  | x  34:36030b147271@default(draft) will be amended
  |/

3359:ae6fddf39933

  0	: base - test
  $ hg up -q 0
  $ glog --hidden
  o  4:ba0ec09b1bab@default(draft) a nifty feature
  |
  | *  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
  | |
  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
  | |/
  | x  1:568a468b60fc@default(draft) a nifty feature
  |/

(ninja test for the {trouble} template:

  $ hg log -G --template '{rev} {troubles}\n'
  @  10
  |
  | *  9 orphan
  | |
  | *  8 orphan
  | |
  | x  7
  |/
  o  5
  |

  $ hg up -r "desc('a2')"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  9 [default] a1__
  |
  | *  8 [mybranch] a3
  | |
  | @  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  $ glog
  @  10:d952e93add6f@mybranch(draft) a2
  |
  o  9:9f8b83c2e7f3@default(draft) a1__
  |
  | *  8:777c26ca5e78@mybranch(draft) a3
  | |
  | x  7:eb07e22a0e63@mybranch(draft) a2
  | |
  | x  6:faafc6cea0ba@default(draft) a1_
  |/

  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  10 [mybranch] a2
  |
  @  9 [default] a1__
  |
  | *  8 [mybranch] a3
  | |
  | x  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | *  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | *  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  $ hg amend
  2 new orphan changesets
  $ glog
  @  16:edc3c9de504e@default(draft) a3
  |
  | *  15:beb41503aa3e@default(draft) add gh
  | |
  | | *  14:27247fcb2df6@default(draft) add gg
  | |/
  | x  13:cce26b684bfe@default(draft) a3
  |/
  o  12:f15d32934071@default(draft) bumped update to d952e93add6f:
  |

  $ hg amend
  2 new orphan changesets
  $ glog -r "edc3c9de504e::"
  @  22:8dc373be86d9@default(draft) add j1
  |
  | *  21:d7eadcf6eccd@default(draft) add j3
  | |
  | *  20:2223ea564144@default(draft) add j2
  | |
  | x  19:48490698b269@default(draft) add j1
  |/
  | o  18:e02107f98737@default(draft) add gh
  | |

  new changeset is empty
  (use 'hg prune .' to remove it)
  $ glog -r "edc3c9de504e::"
  @  23:044804d0c10d@default(draft) add j1
  |
  | *  21:d7eadcf6eccd@default(draft) add j3
  | |
  | *  20:2223ea564144@default(draft) add j2
  | |
  | x  19:48490698b269@default(draft) add j1
  |/
  | o  18:e02107f98737@default(draft) add gh
  | |

  $ glog -r "edc3c9de504e::"
  @  32:7a555adf2b4a@default(draft) _pp
  |
  o  31:2be4d2d5bf34@default(draft) _oo
  |
  | *  30:53f0c003e03e@default(draft) add uu
  | |
  | x  29:1bf2152f4f82@default(draft) oo+pp
  |/
  | o  28:580886d07058@default(draft) add gg
  | |

  $ glog -r "43c3f5ef149f::" --hidden
  @  38:c904da5245b0@default(draft) will be evolved safely
  |
  o  37:34ae045ec400@default(draft) amended
  |
  | *  36:02e943732647@default(draft) will cause conflict at evolve
  | |
  | x  35:f8e30e9317aa@default(draft) will be evolved safely
  | |
  | x  34:36030b147271@default(draft) will be amended
  |/