Mercurial > evolve

comparison tests/test-evolve-abort-contentdiv.t @ 3930:d00f0c369bc7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:47:44 +0200
parents f7afd3a158e3
children 537fd9a86c06 684cc3418ecd
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
43 43
44 $ echo bar > d 44 $ echo bar > d
45 $ hg amend 45 $ hg amend
46 46
47 $ hg up c41c793e0ef1 --hidden 47 $ hg up c41c793e0ef1 --hidden
48 updating to a hidden changeset c41c793e0ef1
49 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 working directory parent is obsolete! (c41c793e0ef1) 49 working directory parent is obsolete! (c41c793e0ef1)
52 (use 'hg evolve' to update to its successor: e49523854bc8) 50 (use 'hg evolve' to update to its successor: e49523854bc8)
53 51
54 $ echo foobar > d 52 $ echo foobar > d
55 $ hg amend 53 $ hg amend
56 2 new content-divergent changesets 54 2 new content-divergent changesets
57 $ hg glog --hidden 55 $ hg glog --hidden
58 @ 6:9c1631e352d9 added d 56 @ 6:9c1631e352d9 added d
59 | () draft 57 | () draft
60 | * 5:e49523854bc8 added d 58 | o 5:e49523854bc8 added d
61 |/ () draft 59 |/ () draft
62 | x 4:c41c793e0ef1 added d 60 | x 4:c41c793e0ef1 added d
63 |/ () draft 61 |/ () draft
64 o 3:ca1b80f7960a added c 62 o 3:ca1b80f7960a added c
65 | () draft 63 | () draft
102 working directory is now at 9c1631e352d9 100 working directory is now at 9c1631e352d9
103 101
104 $ hg glog --hidden 102 $ hg glog --hidden
105 @ 6:9c1631e352d9 added d 103 @ 6:9c1631e352d9 added d
106 | () draft 104 | () draft
107 | * 5:e49523854bc8 added d 105 | o 5:e49523854bc8 added d
108 |/ () draft 106 |/ () draft
109 | x 4:c41c793e0ef1 added d 107 | x 4:c41c793e0ef1 added d
110 |/ () draft 108 |/ () draft
111 o 3:ca1b80f7960a added c 109 o 3:ca1b80f7960a added c
112 | () draft 110 | () draft
141 $ hg glog --hidden 139 $ hg glog --hidden
142 @ 10:491e10505bae added c 140 @ 10:491e10505bae added c
143 | () draft 141 | () draft
144 | x 9:7398f702a162 added c 142 | x 9:7398f702a162 added c
145 |/ () draft 143 |/ () draft
146 | * 8:2ba73e31f264 added c 144 | o 8:2ba73e31f264 added c
147 |/ () draft 145 |/ () draft
148 | * 7:f0f1694f123e added d 146 | o 7:f0f1694f123e added d
149 | | () draft 147 | | () draft
150 | | x 6:9c1631e352d9 added d 148 | | x 6:9c1631e352d9 added d
151 | |/ () draft 149 | |/ () draft
152 | | * 5:e49523854bc8 added d 150 | | o 5:e49523854bc8 added d
153 | |/ () draft 151 | |/ () draft
154 | | x 4:c41c793e0ef1 added d 152 | | x 4:c41c793e0ef1 added d
155 | |/ () draft 153 | |/ () draft
156 | x 3:ca1b80f7960a added c 154 | x 3:ca1b80f7960a added c
157 |/ () draft 155 |/ () draft
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
180 fix conflicts and see `hg help evolve.interrupted` 178 fix conflicts and see `hg help evolve.interrupted`
181 [1] 179 [1]
182 180
183 $ hg evolve --abort 181 $ hg evolve --abort
184 2 new content-divergent changesets
185 evolve aborted 182 evolve aborted
186 working directory is now at 491e10505bae 183 working directory is now at 491e10505bae
187 184
188 $ hg glog --hidden 185 $ hg glog --hidden
189 @ 10:491e10505bae added c 186 @ 10:491e10505bae added c
190 | () draft 187 | () draft
191 | x 9:7398f702a162 added c 188 | x 9:7398f702a162 added c
192 |/ () draft 189 |/ () draft
193 | * 8:2ba73e31f264 added c 190 | o 8:2ba73e31f264 added c
194 |/ () draft 191 |/ () draft
195 | * 7:f0f1694f123e added d 192 | o 7:f0f1694f123e added d
196 | | () draft 193 | | () draft
197 | | x 6:9c1631e352d9 added d 194 | | x 6:9c1631e352d9 added d
198 | |/ () draft 195 | |/ () draft
199 | | * 5:e49523854bc8 added d 196 | | o 5:e49523854bc8 added d
200 | |/ () draft 197 | |/ () draft
201 | | x 4:c41c793e0ef1 added d 198 | | x 4:c41c793e0ef1 added d
202 | |/ () draft 199 | |/ () draft
203 | x 3:ca1b80f7960a added c 200 | x 3:ca1b80f7960a added c
204 |/ () draft 201 |/ () draft
208 | () draft 205 | () draft
209 o 0:8fa14d15e168 added hgignore 206 o 0:8fa14d15e168 added hgignore
210 () draft 207 () draft
211 208
212 $ hg obslog -r . --all 209 $ hg obslog -r . --all
213 * 2ba73e31f264 (8) added c 210 o 2ba73e31f264 (8) added c
214 | 211 |
215 | @ 491e10505bae (10) added c 212 | @ 491e10505bae (10) added c
216 | | 213 | |
217 | x 7398f702a162 (9) added c 214 | x 7398f702a162 (9) added c
218 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) 215 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
251 $ echo bar > c 248 $ echo bar > c
252 $ hg add c 249 $ hg add c
253 $ hg amend 250 $ hg amend
254 251
255 $ hg up --hidden c41c793e0ef1 252 $ hg up --hidden c41c793e0ef1
256 updating to a hidden changeset c41c793e0ef1
257 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
258 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 253 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
259 working directory parent is obsolete! (c41c793e0ef1) 254 working directory parent is obsolete! (c41c793e0ef1)
260 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) 255 (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
261 $ echo bar > d 256 $ echo bar > d
262 $ hg amend 257 $ hg amend
263 2 new content-divergent changesets 258 2 new content-divergent changesets
264 259
265 $ hg glog 260 $ hg glog
266 @ 7:e49523854bc8 added d 261 @ 7:e49523854bc8 added d
267 | () draft 262 | () draft
268 | * 6:69bdd23a9b0d added d 263 | o 6:69bdd23a9b0d added d
269 | | () draft 264 | | () draft
270 o | 3:ca1b80f7960a added c 265 o | 3:ca1b80f7960a added c
271 | | () draft 266 | | () draft
272 o | 2:b1661037fa25 added b 267 o | 2:b1661037fa25 added b
273 |/ () draft 268 |/ () draft
291 working directory is now at e49523854bc8 286 working directory is now at e49523854bc8
292 287
293 $ hg glog 288 $ hg glog
294 @ 7:e49523854bc8 added d 289 @ 7:e49523854bc8 added d
295 | () draft 290 | () draft
296 | * 6:69bdd23a9b0d added d 291 | o 6:69bdd23a9b0d added d
297 | | () draft 292 | | () draft
298 o | 3:ca1b80f7960a added c 293 o | 3:ca1b80f7960a added c
299 | | () draft 294 | | () draft
300 o | 2:b1661037fa25 added b 295 o | 2:b1661037fa25 added b
301 |/ () draft 296 |/ () draft
315 $ hg amend 310 $ hg amend
316 311
317 $ hg glog 312 $ hg glog
318 @ 8:33e4442acf98 added d 313 @ 8:33e4442acf98 added d
319 | () draft 314 | () draft
320 | * 7:e49523854bc8 added d 315 | o 7:e49523854bc8 added d
321 | | () draft 316 | | () draft
322 | o 3:ca1b80f7960a added c 317 | o 3:ca1b80f7960a added c
323 | | () draft 318 | | () draft
324 | o 2:b1661037fa25 added b 319 | o 2:b1661037fa25 added b
325 |/ () draft 320 |/ () draft
346 working directory is now at 33e4442acf98 341 working directory is now at 33e4442acf98
347 342
348 $ hg glog 343 $ hg glog
349 @ 8:33e4442acf98 added d 344 @ 8:33e4442acf98 added d
350 | () draft 345 | () draft
351 | * 7:e49523854bc8 added d 346 | o 7:e49523854bc8 added d
352 | | () draft 347 | | () draft
353 | o 3:ca1b80f7960a added c 348 | o 3:ca1b80f7960a added c
354 | | () draft 349 | | () draft
355 | o 2:b1661037fa25 added b 350 | o 2:b1661037fa25 added b
356 |/ () draft 351 |/ () draft