Mercurial > evolve

comparison tests/test-evolve-continue.t @ 4505:cc2bbe2701a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: store --update flag state in evolvestate file Part of 9c522bdfc846 that wasn't yet accepted.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Apr 2019 17:45:36 +0800
parents 73ef37904b07
children f54bb6eaf5e6 96ce1030d2fb
comparison
equal deleted inserted replaced
4504:4d8db57e24fc 4505:cc2bbe2701a3
29 o 1:c7586e2a9264 added a 29 o 1:c7586e2a9264 added a
30 | () draft 30 | () draft
31 o 0:8fa14d15e168 added hgignore 31 o 0:8fa14d15e168 added hgignore
32 () draft 32 () draft
33 33
34 Simple case of evolve --continue 34 Simple case of evolve --continue (with --[no-]update flag)
35 35
36 $ hg up ca1b80f7960a 36 $ hg up ca1b80f7960a
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ echo bar > d 38 $ echo bar > d
39 $ hg add d 39 $ hg add d
51 o 1:c7586e2a9264 added a 51 o 1:c7586e2a9264 added a
52 | () draft 52 | () draft
53 o 0:8fa14d15e168 added hgignore 53 o 0:8fa14d15e168 added hgignore
54 () draft 54 () draft
55 55
56 $ hg evolve --all 56 $ hg evolve --all --no-update
57 move:[4] added d 57 move:[4] added d
58 atop:[5] added c 58 atop:[5] added c
59 merging d 59 merging d
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
61 fix conflicts and see `hg help evolve.interrupted` 61 fix conflicts and see `hg help evolve.interrupted`
66 (no more unresolved files) 66 (no more unresolved files)
67 continue: hg evolve --continue 67 continue: hg evolve --continue
68 68
69 $ hg evolve --continue 69 $ hg evolve --continue
70 evolving 4:c41c793e0ef1 "added d" 70 evolving 4:c41c793e0ef1 "added d"
71 working directory is now at 2a4e03d422e2 71 working directory is now at cb6a2ab625bb
72 72
73 $ hg glog 73 $ hg glog
74 @ 6:2a4e03d422e2 added d 74 o 6:2a4e03d422e2 added d
75 | () draft 75 | () draft
76 o 5:cb6a2ab625bb added c 76 @ 5:cb6a2ab625bb added c
77 | () draft 77 | () draft
78 o 2:b1661037fa25 added b 78 o 2:b1661037fa25 added b
79 | () draft 79 | () draft
80 o 1:c7586e2a9264 added a 80 o 1:c7586e2a9264 added a
81 | () draft 81 | () draft
82 o 0:8fa14d15e168 added hgignore 82 o 0:8fa14d15e168 added hgignore
83 () draft 83 () draft
84
85 $ hg up
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 87
85 Case when conflicts resolution lead to empty wdir in evolve --continue 88 Case when conflicts resolution lead to empty wdir in evolve --continue
86 89
87 $ echo foo > e 90 $ echo foo > e
88 $ hg ci -Aqm "added e" 91 $ hg ci -Aqm "added e"