|
1 ================================================================= |
|
2 This files test the proper behavior of evo during merge conflict. |
|
3 ================================================================= |
|
4 |
|
5 Initial setup |
|
6 |
|
7 $ cat >> $HGRCPATH <<EOF |
|
8 > [ui] |
|
9 > interactive=false |
|
10 > merge=internal:merge |
|
11 > [defaults] |
|
12 > amend=-d "0 0" |
|
13 > [merge-tools] |
|
14 > touch.checkchanged=true |
|
15 > touch.gui=true |
|
16 > touch.args=babar |
|
17 > [extensions] |
|
18 > hgext.rebase= |
|
19 > EOF |
|
20 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
21 |
|
22 |
|
23 create a simple repo |
|
24 |
|
25 $ hg init repo |
|
26 $ cd repo |
|
27 $ cat << EOF > babar |
|
28 > un |
|
29 > deux |
|
30 > trois |
|
31 > quatre |
|
32 > cinq |
|
33 > EOF |
|
34 $ hg add babar |
|
35 $ hg commit -m "babar count up to five" |
|
36 $ cat << EOF >> babar |
|
37 > six |
|
38 > sept |
|
39 > huit |
|
40 > neuf |
|
41 > dix |
|
42 > EOF |
|
43 $ hg commit -m "babar count up to ten" |
|
44 $ cat << EOF >> babar |
|
45 > onze |
|
46 > douze |
|
47 > treize |
|
48 > quatorze |
|
49 > quinze |
|
50 > EOF |
|
51 $ hg commit -m "babar count up to fifteen" |
|
52 |
|
53 |
|
54 proper behavior without conflict |
|
55 ---------------------------------- |
|
56 |
|
57 $ hg gdown |
|
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 [1] babar count up to ten |
|
60 $ sed -i'' 's/huit/height/' babar |
|
61 $ hg diff |
|
62 diff -r 9d5daf8bd956 babar |
|
63 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
64 +++ b/babar * (glob) |
|
65 @@ -5,6 +5,6 @@ |
|
66 cinq |
|
67 six |
|
68 sept |
|
69 -huit |
|
70 +height |
|
71 neuf |
|
72 dix |
|
73 $ hg amend |
|
74 1 new unstable changesets |
|
75 $ hg evolve |
|
76 move:[2] babar count up to fifteen |
|
77 atop:[4] babar count up to ten |
|
78 merging babar |
|
79 $ hg resolve -l |
|
80 $ hg log -G |
|
81 @ changeset: 5:fd62611d0178 |
|
82 | tag: tip |
|
83 | user: test |
|
84 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 | summary: babar count up to fifteen |
|
86 | |
|
87 o changeset: 4:83066dedff55 |
|
88 | parent: 0:29ec1554cfaf |
|
89 | user: test |
|
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
91 | summary: babar count up to ten |
|
92 | |
|
93 o changeset: 0:29ec1554cfaf |
|
94 user: test |
|
95 date: Thu Jan 01 00:00:00 1970 +0000 |
|
96 summary: babar count up to five |
|
97 |
|
98 |
|
99 |
|
100 proper behavior with conflict using internal:merge |
|
101 -------------------------------------------------- |
|
102 |
|
103 $ hg gdown |
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
105 [4] babar count up to ten |
|
106 $ sed -i'' 's/dix/ten/' babar |
|
107 $ hg diff |
|
108 diff -r 83066dedff55 babar |
|
109 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
110 +++ b/babar * (glob) |
|
111 @@ -7,4 +7,4 @@ |
|
112 sept |
|
113 height |
|
114 neuf |
|
115 -dix |
|
116 +ten |
|
117 $ hg amend |
|
118 1 new unstable changesets |
|
119 $ hg evolve |
|
120 move:[5] babar count up to fifteen |
|
121 atop:[7] babar count up to ten |
|
122 merging babar |
|
123 warning: conflicts during merge. |
|
124 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
125 evolve failed! |
|
126 fix conflict and run "hg evolve --continue" |
|
127 abort: unresolved merge conflicts (see hg help resolve) |
|
128 [255] |
|
129 $ hg resolve -l |
|
130 U babar |
|
131 $ hg log -G |
|
132 @ changeset: 7:cc96f75eae0b |
|
133 | tag: tip |
|
134 | parent: 0:29ec1554cfaf |
|
135 | user: test |
|
136 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
137 | summary: babar count up to ten |
|
138 | |
|
139 | @ changeset: 5:fd62611d0178 |
|
140 | | user: test |
|
141 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
142 | | summary: babar count up to fifteen |
|
143 | | |
|
144 | x changeset: 4:83066dedff55 |
|
145 |/ parent: 0:29ec1554cfaf |
|
146 | user: test |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
148 | summary: babar count up to ten |
|
149 | |
|
150 o changeset: 0:29ec1554cfaf |
|
151 user: test |
|
152 date: Thu Jan 01 00:00:00 1970 +0000 |
|
153 summary: babar count up to five |
|
154 |
|
155 (fix the conflict and continue) |
|
156 |
|
157 $ hg revert -r 5 --all |
|
158 reverting babar |
|
159 $ sed -i'' 's/dix/ten/' babar |
|
160 $ hg resolve --all -m |
|
161 $ hg evolve --continue |
|
162 grafting revision 5 |
|
163 $ hg resolve -l |
|
164 $ hg log -G |
|
165 @ changeset: 8:ce7ee8fecf30 |
|
166 | tag: tip |
|
167 | user: test |
|
168 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
169 | summary: babar count up to fifteen |
|
170 | |
|
171 o changeset: 7:cc96f75eae0b |
|
172 | parent: 0:29ec1554cfaf |
|
173 | user: test |
|
174 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 | summary: babar count up to ten |
|
176 | |
|
177 o changeset: 0:29ec1554cfaf |
|
178 user: test |
|
179 date: Thu Jan 01 00:00:00 1970 +0000 |
|
180 summary: babar count up to five |
|
181 |
|
182 proper behavior with conflict using an external merge tools |
|
183 ----------------------------------------------------------- |
|
184 |
|
185 $ sed -i'' 's/merge=.*/merge=touch/' $HGRCPATH |
|
186 $ sed -i'' 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
|
187 $ hg gdown |
|
188 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
189 [7] babar count up to ten |
|
190 $ sed -i'' 's/ten/zehn/' babar |
|
191 $ hg diff |
|
192 diff -r cc96f75eae0b babar |
|
193 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
194 +++ b/babar * (glob) |
|
195 @@ -7,4 +7,4 @@ |
|
196 sept |
|
197 height |
|
198 neuf |
|
199 -ten |
|
200 +zehn |
|
201 $ hg amend |
|
202 1 new unstable changesets |
|
203 $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH |
|
204 $ yes n 2> ../shutup | HGMERGE=touch hg evolve |
|
205 move:[8] babar count up to fifteen |
|
206 atop:[10] babar count up to ten |
|
207 merging babar |
|
208 output file babar appears unchanged |
|
209 was merge successful (yn)? merging babar failed! |
|
210 evolve failed! |
|
211 fix conflict and run "hg evolve --continue" |
|
212 abort: unresolved merge conflicts (see hg help resolve) |
|
213 [255] |
|
214 $ hg resolve -l |
|
215 U babar |
|
216 $ hg log -G |
|
217 @ changeset: 10:02c637e61375 |
|
218 | tag: tip |
|
219 | parent: 0:29ec1554cfaf |
|
220 | user: test |
|
221 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
222 | summary: babar count up to ten |
|
223 | |
|
224 | @ changeset: 8:ce7ee8fecf30 |
|
225 | | user: test |
|
226 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
227 | | summary: babar count up to fifteen |
|
228 | | |
|
229 | x changeset: 7:cc96f75eae0b |
|
230 |/ parent: 0:29ec1554cfaf |
|
231 | user: test |
|
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
233 | summary: babar count up to ten |
|
234 | |
|
235 o changeset: 0:29ec1554cfaf |
|
236 user: test |
|
237 date: Thu Jan 01 00:00:00 1970 +0000 |
|
238 summary: babar count up to five |
|
239 |
|
240 $ cat babar |
|
241 un |
|
242 deux |
|
243 trois |
|
244 quatre |
|
245 cinq |
|
246 six |
|
247 sept |
|
248 height |
|
249 neuf |
|
250 zehn |