Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 4576:96ce1030d2fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --update to hg evolve to reduce test changes for the next patch
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Apr 2019 02:18:19 +0800
parents 4eb3877540f1
children 30a544904238
comparison
equal deleted inserted replaced
4575:903e8b983fac 4576:96ce1030d2fb
63 | o 1:c7586e2a9264 added a 63 | o 1:c7586e2a9264 added a
64 |/ () draft 64 |/ () draft
65 o 0:8fa14d15e168 added hgignore 65 o 0:8fa14d15e168 added hgignore
66 () draft 66 () draft
67 67
68 $ hg evolve --all 68 $ hg evolve --all --update
69 move:[3] merging a and b 69 move:[3] merging a and b
70 atop:[4] added b 70 atop:[4] added b
71 working directory is now at 91fd62122a4b 71 working directory is now at 91fd62122a4b
72 72
73 $ hg glog 73 $ hg glog
108 | x 1:c7586e2a9264 added a 108 | x 1:c7586e2a9264 added a
109 |/ () draft 109 |/ () draft
110 o 0:8fa14d15e168 added hgignore 110 o 0:8fa14d15e168 added hgignore
111 () draft 111 () draft
112 112
113 $ hg evolve --all 113 $ hg evolve --all --update
114 move:[5] merging a and b 114 move:[5] merging a and b
115 atop:[6] added a 115 atop:[6] added a
116 working directory is now at 968d205ba4d8 116 working directory is now at 968d205ba4d8
117 117
118 $ hg glog 118 $ hg glog
212 | x 8:1c165c673853 foo to c 212 | x 8:1c165c673853 foo to c
213 |/ () draft 213 |/ () draft
214 o 0:8fa14d15e168 added hgignore 214 o 0:8fa14d15e168 added hgignore
215 () draft 215 () draft
216 216
217 $ hg evolve --all 217 $ hg evolve --all --update
218 move:[10] foobar to c 218 move:[10] foobar to c
219 atop:[11] foo to c 219 atop:[11] foo to c
220 merging c 220 merging c
221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
222 fix conflicts and see `hg help evolve.interrupted` 222 fix conflicts and see `hg help evolve.interrupted`
267 | o 9:d0f84b25d4e3 bar to c 267 | o 9:d0f84b25d4e3 bar to c
268 |/ () draft 268 |/ () draft
269 o 0:8fa14d15e168 added hgignore 269 o 0:8fa14d15e168 added hgignore
270 () draft 270 () draft
271 271
272 $ hg evolve --all 272 $ hg evolve --all --update
273 move:[12] foobar to c 273 move:[12] foobar to c
274 atop:[13] foo to c 274 atop:[13] foo to c
275 merging c 275 merging c
276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
277 fix conflicts and see `hg help evolve.interrupted` 277 fix conflicts and see `hg help evolve.interrupted`
344 | | () draft 344 | | () draft
345 | x 15:8634bee7bf1e added l 345 | x 15:8634bee7bf1e added l
346 |/ () draft 346 |/ () draft
347 o 0:8fa14d15e168 added hgignore 347 o 0:8fa14d15e168 added hgignore
348 () draft 348 () draft
349 $ hg evolve --all 349 $ hg evolve --all --update
350 move:[16] added m 350 move:[16] added m
351 atop:[20] added l 351 atop:[20] added l
352 move:[19] merge commit 352 move:[19] merge commit
353 working directory is now at a446ad3e6700 353 working directory is now at a446ad3e6700
354 354
409 |/ () draft 409 |/ () draft
410 o 0:8fa14d15e168 added hgignore 410 o 0:8fa14d15e168 added hgignore
411 () draft 411 () draft
412 412
413 XXX: We should handle this case too 413 XXX: We should handle this case too
414 $ hg evolve --all 414 $ hg evolve --all --update
415 move:[23] merged l and x 415 move:[23] merged l and x
416 atop:[25] added x 416 atop:[25] added x
417 move:[26] merged l and x 417 move:[26] merged l and x
418 atop:[24] added l 418 atop:[24] added l
419 working directory is now at adb665a78e08 419 working directory is now at adb665a78e08