Mercurial > evolve

comparison tests/test-evolve-order.t @ 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 96ce1030d2fb
children 79bc0f1a832e 1f92a6aa40d6
comparison
equal deleted inserted replaced
4576:96ce1030d2fb 4577:bcd52ce0916d
60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order 60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order
61 $ hg evolve --rev 'desc(_c) + desc(_b)' 61 $ hg evolve --rev 'desc(_c) + desc(_b)'
62 move:[2] add _b 62 move:[2] add _b
63 atop:[4] add _a 63 atop:[4] add _a
64 move:[3] add _c 64 move:[3] add _c
65 working directory is now at 52b8f9b04f83
66 65
67 evolve --rev reorders the rev to solve instability. Harder case, obsolescence 66 evolve --rev reorders the rev to solve instability. Harder case, obsolescence
68 accross three stacks in growing rev numbers. 67 accross three stacks in growing rev numbers.
69 $ hg up "desc(_c)" 68 $ hg up "desc(_c)"
70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
71 $ mkcommit _d 70 $ mkcommit _d
72 $ hg up "desc(_a)" 71 $ hg up "desc(_a)"
73 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 72 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
74 $ hg amend -m "aprime" 73 $ hg amend -m "aprime"
75 3 new orphan changesets 74 3 new orphan changesets
76 $ hg evolve --rev "desc(_b)" 75 $ hg evolve --rev "desc(_b)"
77 move:[5] add _b 76 move:[5] add _b
78 atop:[8] aprime 77 atop:[8] aprime
79 working directory is now at 476c9c052aae
80 $ hg up "desc(_b) - obsolete()" 78 $ hg up "desc(_b) - obsolete()"
81 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 $ hg amend -m "bprime" 80 $ hg amend -m "bprime"
83 $ hg up "desc(aprime)" 81 $ hg up "desc(aprime)"
84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
85 $ hg amend -m "asecond" 83 $ hg amend -m "asecond"
86 1 new orphan changesets 84 1 new orphan changesets
202 cannot solve instability of d096a2437fd0, skipping 200 cannot solve instability of d096a2437fd0, skipping
203 move:[20] add c2prime 201 move:[20] add c2prime
204 atop:[21] add c1second 202 atop:[21] add c1second
205 move:[25] add b4_ 203 move:[25] add b4_
206 atop:[27] add b3prime 204 atop:[27] add b3prime
207 working directory is now at ea93190a9cd1
208 205
209 Cleanup 206 Cleanup
210 $ hg evolve --rev "(desc(_d)::)" --update 207 $ hg evolve --rev "(desc(_d)::)" --update
211 move:[17] add c3_ 208 move:[17] add c3_
212 atop:[28] add c2prime 209 atop:[28] add c2prime
255 1 new orphan changesets 252 1 new orphan changesets
256 $ hg evolve --rev "orphan()" 253 $ hg evolve --rev "orphan()"
257 move:[29] add b4_ 254 move:[29] add b4_
258 atop:[34] b3second 255 atop:[34] b3second
259 skipping 0b9488394e89: divergent rewriting. can't choose destination 256 skipping 0b9488394e89: divergent rewriting. can't choose destination
260 working directory is now at 31809a198477
261