| author | Pulkit Goyal <7895pulkit@gmail.com> |
| Mon, 22 Jan 2018 18:52:27 +0530 | |
| changeset 3490 | 51c0a23b519e |
| parent 3489 | ee72cdc2387b |
| child 3491 | 92df1aac8c7f |
| permissions | -rw-r--r-- |
|
3489
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Testing the continue functionality of `hg evolve` |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
$ cat >> $HGRCPATH <<EOF |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
> [ui] |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
> interactive = True |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
> [alias] |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
> glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [extensions] |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> rebase = |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
> EOF |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
Setting up the repo |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
$ hg init repo |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ cd repo |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ echo ".*\.orig" > .hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ hg add .hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ hg ci -m "added hgignore" |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ for ch in a b c d; do echo foo>$ch; hg add $ch; hg ci -qm "added "$ch; done |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ hg glog |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
@ 4:c41c793e0ef1 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
o 3:ca1b80f7960a added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
o 2:b1661037fa25 added b |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
o 1:c7586e2a9264 added a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
o 0:8fa14d15e168 added hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
() draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
Simple case of evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
$ hg up ca1b80f7960a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
$ echo bar > d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
$ hg add d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
$ hg amend |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
1 new orphan changesets |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
$ hg glog |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
@ 5:cb6a2ab625bb added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
| * 4:c41c793e0ef1 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
| | () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
| x 3:ca1b80f7960a added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
|/ () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
o 2:b1661037fa25 added b |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
o 1:c7586e2a9264 added a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
o 0:8fa14d15e168 added hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
() draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
$ hg evolve --all |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
move:[4] added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
atop:[5] added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
merging d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
evolve failed! |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
abort: unresolved merge conflicts (see hg help resolve) |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
[255] |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
$ echo foo > d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
$ hg resolve -m |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
(no more unresolved files) |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
continue: hg evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
$ hg evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
evolving 4:c41c793e0ef1 "added d" |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
$ hg glog |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
@ 6:2a4e03d422e2 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
o 5:cb6a2ab625bb added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
o 2:b1661037fa25 added b |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
o 1:c7586e2a9264 added a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
o 0:8fa14d15e168 added hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
() draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
Case when conflicts resolution lead to empty wdir in evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
$ echo foo > e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
$ hg ci -Aqm "added e" |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
$ hg prev |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
[6] added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
$ echo bar > e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
$ hg add e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
$ hg amend |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
1 new orphan changesets |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
$ hg glog |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
@ 8:00a5c774cc37 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
| * 7:ad0a59d83efe added e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
| | () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
| x 6:2a4e03d422e2 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
|/ () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
o 5:cb6a2ab625bb added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
o 2:b1661037fa25 added b |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
o 1:c7586e2a9264 added a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
o 0:8fa14d15e168 added hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
() draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
$ hg evolve |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
move:[7] added e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
atop:[8] added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
merging e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
evolve failed! |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
abort: unresolved merge conflicts (see hg help resolve) |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
[255] |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
$ echo bar > e |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
$ hg resolve -m |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
(no more unresolved files) |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
continue: hg evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
$ hg diff |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
XXX: maybe we should add a message here about evolve resulting in no commit |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
$ hg evolve --continue |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
evolving 7:ad0a59d83efe "added e" |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
|
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
$ hg glog |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
@ 8:00a5c774cc37 added d |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
o 5:cb6a2ab625bb added c |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
o 2:b1661037fa25 added b |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
o 1:c7586e2a9264 added a |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 |
| () draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
o 0:8fa14d15e168 added hgignore |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
() draft |
|
ee72cdc2387b
tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |