Mercurial > evolve

comparison tests/test-evolve-stop-orphan.t @ 5714:b3d9e6c805d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents 6eb9f82b43ba
children 61d2f1cf90f0
comparison
equal deleted inserted replaced
5713:c3c870f3b98e 5714:b3d9e6c805d6
90 atop:[5] added c 90 atop:[5] added c
91 merging d 91 merging d
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
93 unresolved merge conflicts 93 unresolved merge conflicts
94 (see 'hg help evolve.interrupted') 94 (see 'hg help evolve.interrupted')
95 [1] 95 [240]
96 96
97 $ hg evolve --stop 97 $ hg evolve --stop
98 stopped the interrupted evolve 98 stopped the interrupted evolve
99 working directory is now at cb6a2ab625bb 99 working directory is now at cb6a2ab625bb
100 100
136 atop:[5] added c 136 atop:[5] added c
137 merging d 137 merging d
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
139 unresolved merge conflicts 139 unresolved merge conflicts
140 (see 'hg help evolve.interrupted') 140 (see 'hg help evolve.interrupted')
141 [1] 141 [240]
142 142
143 $ hg diff 143 $ hg diff
144 diff -r cb6a2ab625bb d 144 diff -r cb6a2ab625bb d
145 --- a/d Thu Jan 01 00:00:00 1970 +0000 145 --- a/d Thu Jan 01 00:00:00 1970 +0000
146 +++ b/d Thu Jan 01 00:00:00 1970 +0000 146 +++ b/d Thu Jan 01 00:00:00 1970 +0000
198 atop:[5] added c 198 atop:[5] added c
199 merging d 199 merging d
200 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 200 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
201 unresolved merge conflicts 201 unresolved merge conflicts
202 (see 'hg help evolve.interrupted') 202 (see 'hg help evolve.interrupted')
203 [1] 203 [240]
204 $ echo foo > d 204 $ echo foo > d
205 $ hg resolve -m 205 $ hg resolve -m
206 (no more unresolved files) 206 (no more unresolved files)
207 continue: hg evolve --continue 207 continue: hg evolve --continue
208 $ hg evolve --continue 208 $ hg evolve --continue
248 move:[5] added c 248 move:[5] added c
249 merging c 249 merging c
250 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 250 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
251 unresolved merge conflicts 251 unresolved merge conflicts
252 (see 'hg help evolve.interrupted') 252 (see 'hg help evolve.interrupted')
253 [1] 253 [240]
254 254
255 $ hg status 255 $ hg status
256 M c 256 M c
257 A d 257 A d
258 258
286 atop:[9] added b 286 atop:[9] added b
287 merging c 287 merging c
288 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 288 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
289 unresolved merge conflicts 289 unresolved merge conflicts
290 (see 'hg help evolve.interrupted') 290 (see 'hg help evolve.interrupted')
291 [1] 291 [240]
292 292
293 $ echo foobar > c 293 $ echo foobar > c
294 $ hg resolve -m 294 $ hg resolve -m
295 (no more unresolved files) 295 (no more unresolved files)
296 continue: hg evolve --continue 296 continue: hg evolve --continue
361 move:[10] added c 361 move:[10] added c
362 merging c 362 merging c
363 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 363 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
364 unresolved merge conflicts 364 unresolved merge conflicts
365 (see 'hg help evolve.interrupted') 365 (see 'hg help evolve.interrupted')
366 [1] 366 [240]
367 367
368 $ hg evolve --stop 368 $ hg evolve --stop
369 stopped the interrupted evolve 369 stopped the interrupted evolve
370 working directory is now at a3f4b95da934 370 working directory is now at a3f4b95da934
371 371