Mercurial > evolve

comparison tests/test-evolve-order.t @ 2842:2b8b960a04ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: unstable() is deprecated Use orphan() instead. Match c8c04a2b7bb4 mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Fri, 11 Aug 2017 11:23:37 +0200
parents 4dd84054ebbb
children 66796d7b5415
comparison
equal deleted inserted replaced
2841:7f2943b0c8ea 2842:2b8b960a04ee
100 | | 100 | |
101 | x 5:12d519679175@default(draft) add _a 101 | x 5:12d519679175@default(draft) add _a
102 |/ 102 |/
103 o 0:f92638be10c7@default(public) add p 103 o 0:f92638be10c7@default(public) add p
104 104
105 $ hg evolve --rev "unstable()" 105 $ hg evolve --rev "orphan()"
106 move:[11] bprime 106 move:[11] bprime
107 atop:[12] asecond 107 atop:[12] asecond
108 move:[7] add _c 108 move:[7] add _c
109 atop:[13] bprime 109 atop:[13] bprime
110 move:[8] add _d 110 move:[8] add _d
255 2 new divergent changesets 255 2 new divergent changesets
256 $ hg up 'desc(b3prime)' 256 $ hg up 'desc(b3prime)'
257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
258 $ hg amend -m 'b3second' 258 $ hg amend -m 'b3second'
259 1 new unstable changesets 259 1 new unstable changesets
260 $ hg evolve --rev 'unstable()' 260 $ hg evolve --rev "orphan()"
261 move:[30] add b4_ 261 move:[30] add b4_
262 atop:[35] b3second 262 atop:[35] b3second
263 skipping 0b9488394e89: divergent rewriting. can't choose destination 263 skipping 0b9488394e89: divergent rewriting. can't choose destination
264 working directory is now at 31809a198477 264 working directory is now at 31809a198477
265 265