Mercurial > evolve

comparison tests/test-evolve-interrupted.t @ 5821:84da58ad69a1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset ad80552c706c
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:06:41 +0800
parents ad80552c706c
children 73573aec18f7 7dfb3b267070
comparison
equal deleted inserted replaced
5820:5341d7c30e68 5821:84da58ad69a1
46 move:[1] banana 46 move:[1] banana
47 atop:[2] apricot and blueberry 47 atop:[2] apricot and blueberry
48 transaction abort! 48 transaction abort!
49 rollback completed 49 rollback completed
50 abort: precommit hook exited with status 1 50 abort: precommit hook exited with status 1
51 [40] 51 [255]
52 $ hg l 52 $ hg l
53 @ 2 apricot and blueberry 53 @ 2 apricot and blueberry
54 54
55 * 1 banana 55 * 1 banana
56 | 56 |
105 move:[1] banana 105 move:[1] banana
106 atop:[2] apricot and blueberry 106 atop:[2] apricot and blueberry
107 transaction abort! 107 transaction abort!
108 rollback completed 108 rollback completed
109 abort: precommit hook exited with status 1 109 abort: precommit hook exited with status 1
110 [40] 110 [255]
111 $ cat b 111 $ cat b
112 banana 112 banana
113 $ hg evolve --stop 113 $ hg evolve --stop
114 stopped the interrupted evolve 114 stopped the interrupted evolve
115 working directory is now at e1989e4b1526 115 working directory is now at e1989e4b1526
130 move:[1] banana 130 move:[1] banana
131 atop:[2] apricot and blueberry 131 atop:[2] apricot and blueberry
132 transaction abort! 132 transaction abort!
133 rollback completed 133 rollback completed
134 abort: precommit hook exited with status 1 134 abort: precommit hook exited with status 1
135 [40] 135 [255]
136 $ hg evolve --continue 136 $ hg evolve --continue
137 evolving 1:e0486f65907d "banana" 137 evolving 1:e0486f65907d "banana"
138 working directory is now at bd5ec7dfc2af 138 working directory is now at bd5ec7dfc2af
139 $ cat .hg/evolvestate 139 $ cat .hg/evolvestate
140 cat: .hg/evolvestate: No such file or directory 140 cat: .hg/evolvestate: No such file or directory