Mercurial > evolve

comparison tests/test-stabilize-result.t @ 3818:f8677cb11dcb mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 08 Jun 2018 22:52:53 +0530
parents e5ba6531503e
children 537fd9a86c06
comparison
equal deleted inserted replaced
3817:5ca297e78f2c 3818:f8677cb11dcb
25 $ hg up 1 25 $ hg up 1
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 (leaving bookmark changea) 27 (leaving bookmark changea)
28 $ echo a >> a 28 $ echo a >> a
29 $ hg amend -m changea 29 $ hg amend -m changea
30 1 new orphan changesets 30 1 new unstable changesets
31 $ hg evolve -v --confirm 31 $ hg evolve -v --confirm
32 move:[2] changea 32 move:[2] changea
33 atop:[3] changea 33 atop:[4] changea
34 perform evolve? [Ny] n 34 perform evolve? [Ny] n
35 abort: evolve aborted by user 35 abort: evolve aborted by user
36 [255] 36 [255]
37 $ echo y | hg evolve -v --confirm --config ui.interactive=True 37 $ echo y | hg evolve -v --confirm --config ui.interactive=True
38 move:[2] changea 38 move:[2] changea
39 atop:[3] changea 39 atop:[4] changea
40 perform evolve? [Ny] y 40 perform evolve? [Ny] y
41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4
42 resolving manifests 42 resolving manifests
43 evolution of 2:cce2c55b8965 created no changes to commit 43 evolution of 2:cce2c55b8965 created no changes to commit
44 44
45 $ glog --hidden 45 $ glog --hidden
46 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea 46 @ 4:fb9d051ec0a4@default(draft) bk:[changea] changea
47 | 47 |
48 | x 2:cce2c55b8965@default(draft) bk:[] changea 48 | x 3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a
49 | | 49 | |
50 | | x 2:cce2c55b8965@default(draft) bk:[] changea
51 | |/
50 | x 1:102a90ea7b4a@default(draft) bk:[] addb 52 | x 1:102a90ea7b4a@default(draft) bk:[] addb
51 |/ 53 |/
52 o 0:07f494440405@default(draft) bk:[] adda 54 o 0:07f494440405@default(draft) bk:[] adda
53 55
54 $ hg debugobsolete 56 $ hg debugobsolete
55 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 57 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob)
56 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 58 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
59 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
57 60
58 Test evolve with conflict 61 Test evolve with conflict
59 62
60 $ ls 63 $ ls
61 a 64 a
70 $ echo 'newer a' >> a 73 $ echo 'newer a' >> a
71 $ hg ci -m 'newer a' 74 $ hg ci -m 'newer a'
72 $ hg gdown 75 $ hg gdown
73 gdown have been deprecated in favor of previous 76 gdown have been deprecated in favor of previous
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 77 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 [3] changea 78 [4] changea
76 $ echo 'a' > a 79 $ echo 'a' > a
77 $ hg amend 80 $ hg amend
78 1 new orphan changesets 81 1 new unstable changesets
79 $ hg evolve 82 $ hg evolve
80 move:[4] newer a 83 move:[5] newer a
81 atop:[5] changea 84 atop:[7] changea
82 merging a 85 merging a
83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 86 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
84 evolve failed! 87 evolve failed!
85 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 88 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
86 abort: unresolved merge conflicts (see hg help resolve) 89 abort: unresolved merge conflicts (see hg help resolve)
93 @@ -1,1 +1,3 @@ 96 @@ -1,1 +1,3 @@
94 a 97 a
95 +a 98 +a
96 +newer a 99 +newer a
97 $ hg evolve --continue 100 $ hg evolve --continue
98 evolving 4:3655f0f50885 "newer a" 101 evolving 5:3655f0f50885 "newer a"
99 abort: unresolved merge conflicts (see 'hg help resolve') 102 abort: unresolved merge conflicts (see 'hg help resolve')
100 [255] 103 [255]
101 $ hg resolve -m a 104 $ hg resolve -m a
102 (no more unresolved files) 105 (no more unresolved files)
103 continue: hg evolve --continue 106 continue: hg evolve --continue
104 $ hg evolve --continue 107 $ hg evolve --continue
105 evolving 4:3655f0f50885 "newer a" 108 evolving 5:3655f0f50885 "newer a"
106 working directory is now at 1cf0aacfd363 109 working directory is now at 1cf0aacfd363
107 110
108 Stabilize latecomer with different parent 111 Stabilize latecomer with different parent
109 ========================================= 112 =========================================
110 113
111 (the same-parent case is handled in test-evolve.t) 114 (the same-parent case is handled in test-evolve.t)
112 115
113 $ glog 116 $ glog
114 @ 6:1cf0aacfd363@default(draft) bk:[] newer a 117 @ 8:1cf0aacfd363@default(draft) bk:[] newer a
115 | 118 |
116 o 5:66719795a494@default(draft) bk:[changea] changea 119 o 7:66719795a494@default(draft) bk:[changea] changea
117 | 120 |
118 o 0:07f494440405@default(draft) bk:[] adda 121 o 0:07f494440405@default(draft) bk:[] adda
119 122
120 Add another commit 123 Add another commit
121 124
122 $ hg gdown 125 $ hg gdown
123 gdown have been deprecated in favor of previous 126 gdown have been deprecated in favor of previous
124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 127 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
125 [5] changea 128 [7] changea
126 $ echo 'c' > c 129 $ echo 'c' > c
127 $ hg add c 130 $ hg add c
128 $ hg commit -m 'add c' 131 $ hg commit -m 'add c'
129 created new head 132 created new head
130 133
131 Get a successors of 8 on it 134 Get a successors of 8 on it
132 135
133 $ hg grab 1cf0aacfd363 136 $ hg grab 1cf0aacfd363
134 grabbing 6:1cf0aacfd363 "newer a" 137 grabbing 8:1cf0aacfd363 "newer a"
135 138
136 Add real change to the successors 139 Add real change to the successors
137 140
138 $ echo 'babar' >> a 141 $ echo 'babar' >> a
139 $ hg amend 142 $ hg amend
140 143
141 Make precursors public 144 Make precursors public
142 145
143 $ hg phase --hidden --public 1cf0aacfd363 146 $ hg phase --hidden --public 1cf0aacfd363
144 1 new phase-divergent changesets 147 1 new bumped changesets
145 $ glog 148 $ glog
146 @ 9:99c21c89bcef@default(draft) bk:[] newer a 149 @ 12:99c21c89bcef@default(draft) bk:[] newer a
147 | 150 |
148 o 7:7bc2f5967f5e@default(draft) bk:[] add c 151 o 9:7bc2f5967f5e@default(draft) bk:[] add c
149 | 152 |
150 | o 6:1cf0aacfd363@default(public) bk:[] newer a 153 | o 8:1cf0aacfd363@default(public) bk:[] newer a
151 |/ 154 |/
152 o 5:66719795a494@default(public) bk:[changea] changea 155 o 7:66719795a494@default(public) bk:[changea] changea
153 | 156 |
154 o 0:07f494440405@default(public) bk:[] adda 157 o 0:07f494440405@default(public) bk:[] adda
155 158
156 159
157 Stabilize! 160 Stabilize!
158 161
159 $ hg evolve --any --dry-run --phase-divergent 162 $ hg evolve --any --dry-run --phase-divergent
160 recreate:[9] newer a 163 recreate:[12] newer a
161 atop:[6] newer a 164 atop:[8] newer a
162 hg rebase --rev 99c21c89bcef --dest 66719795a494; 165 hg rebase --rev 99c21c89bcef --dest 66719795a494;
163 hg update 1cf0aacfd363; 166 hg update 1cf0aacfd363;
164 hg revert --all --rev 99c21c89bcef; 167 hg revert --all --rev 99c21c89bcef;
165 hg commit --msg "phase-divergent update to 99c21c89bcef" 168 hg commit --msg "bumped update to 99c21c89bcef"
166 $ hg evolve --any --confirm --phase-divergent 169 $ hg evolve --any --confirm --phase-divergent
167 recreate:[9] newer a 170 recreate:[12] newer a
168 atop:[6] newer a 171 atop:[8] newer a
169 perform evolve? [Ny] n 172 perform evolve? [Ny] n
170 abort: evolve aborted by user 173 abort: evolve aborted by user
171 [255] 174 [255]
172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent 175 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent
173 recreate:[9] newer a 176 recreate:[12] newer a
174 atop:[6] newer a 177 atop:[8] newer a
175 perform evolve? [Ny] y 178 perform evolve? [Ny] y
176 rebasing to destination parent: 66719795a494 179 rebasing to destination parent: 66719795a494
177 computing new diff 180 computing new diff
178 committed as 8fc63fe1f297 181 committed as cd735a3aeb32
179 working directory is now at 8fc63fe1f297 182 working directory is now at cd735a3aeb32
180 $ glog 183 $ glog
181 @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 184 @ 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
182 | 185 |
183 | o 7:7bc2f5967f5e@default(draft) bk:[] add c 186 | o 9:7bc2f5967f5e@default(draft) bk:[] add c
184 | | 187 | |
185 o | 6:1cf0aacfd363@default(public) bk:[] newer a 188 o | 8:1cf0aacfd363@default(public) bk:[] newer a
186 |/ 189 |/
187 o 5:66719795a494@default(public) bk:[changea] changea 190 o 7:66719795a494@default(public) bk:[changea] changea
188 | 191 |
189 o 0:07f494440405@default(public) bk:[] adda 192 o 0:07f494440405@default(public) bk:[] adda
190 193
191 $ hg exp 194 $ hg exp
192 # HG changeset patch 195 # HG changeset patch
193 # User test 196 # User test
194 # Date 0 0 197 # Date 0 0
195 # Thu Jan 01 00:00:00 1970 +0000 198 # Thu Jan 01 00:00:00 1970 +0000
196 # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 199 # Node ID cd735a3aeb32e80b92f780c4ace1650597d581b2
197 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 200 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82
198 phase-divergent update to 1cf0aacfd363: 201 bumped update to 1cf0aacfd363:
199 202
200 newer a 203 newer a
201 204
202 diff -r 1cf0aacfd363 -r 8fc63fe1f297 a 205 diff -r 1cf0aacfd363 -r cd735a3aeb32 a
203 --- a/a Thu Jan 01 00:00:00 1970 +0000 206 --- a/a Thu Jan 01 00:00:00 1970 +0000
204 +++ b/a Thu Jan 01 00:00:00 1970 +0000 207 +++ b/a Thu Jan 01 00:00:00 1970 +0000
205 @@ -1,3 +1,4 @@ 208 @@ -1,3 +1,4 @@
206 a 209 a
207 a 210 a
222 > less 225 > less
223 > conflict 226 > conflict
224 > EOF 227 > EOF
225 $ hg ci -m 'More addition' 228 $ hg ci -m 'More addition'
226 $ glog 229 $ glog
227 @ 12:3932c176bbaa@default(draft) bk:[] More addition 230 @ 15:3932c176bbaa@default(draft) bk:[] More addition
228 | 231 |
229 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 232 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
230 | | 233 | |
231 o | 7:7bc2f5967f5e@default(draft) bk:[] add c 234 o | 9:7bc2f5967f5e@default(draft) bk:[] add c
232 | | 235 | |
233 | o 6:1cf0aacfd363@default(public) bk:[] newer a 236 | o 8:1cf0aacfd363@default(public) bk:[] newer a
234 |/ 237 |/
235 o 5:66719795a494@default(public) bk:[changea] changea 238 o 7:66719795a494@default(public) bk:[changea] changea
236 | 239 |
237 o 0:07f494440405@default(public) bk:[] adda 240 o 0:07f494440405@default(public) bk:[] adda
238 241
239 $ echo 'babar' >> a 242 $ echo 'babar' >> a
240 $ hg amend 243 $ hg amend
245 $ mv a a.old 248 $ mv a a.old
246 $ echo 'jungle' > a 249 $ echo 'jungle' > a
247 $ cat a.old >> a 250 $ cat a.old >> a
248 $ rm a.old 251 $ rm a.old
249 $ hg amend 252 $ hg amend
250 2 new content-divergent changesets 253 2 new divergent changesets
251 $ glog 254 $ glog
252 @ 14:eacc9c8240fe@default(draft) bk:[] More addition 255 @ 19:eacc9c8240fe@default(draft) bk:[] More addition
253 | 256 |
254 | o 13:d2f173e25686@default(draft) bk:[] More addition 257 | o 17:d2f173e25686@default(draft) bk:[] More addition
255 |/ 258 |/
256 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 259 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
257 | | 260 | |
258 o | 7:7bc2f5967f5e@default(draft) bk:[] add c 261 o | 9:7bc2f5967f5e@default(draft) bk:[] add c
259 | | 262 | |
260 | o 6:1cf0aacfd363@default(public) bk:[] newer a 263 | o 8:1cf0aacfd363@default(public) bk:[] newer a
261 |/ 264 |/
262 o 5:66719795a494@default(public) bk:[changea] changea 265 o 7:66719795a494@default(public) bk:[changea] changea
263 | 266 |
264 o 0:07f494440405@default(public) bk:[] adda 267 o 0:07f494440405@default(public) bk:[] adda
265 268
266 269
267 Stabilize it 270 Stabilize it
268 271
269 $ hg evolve -qn --confirm --content-divergent 272 $ hg evolve -qn --confirm --content-divergent
270 merge:[14] More addition 273 merge:[19] More addition
271 with: [13] More addition 274 with: [17] More addition
272 base: [12] More addition 275 base: [15] More addition
273 perform evolve? [Ny] n 276 perform evolve? [Ny] n
274 abort: evolve aborted by user 277 abort: evolve aborted by user
275 [255] 278 [255]
276 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent 279 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent
277 merge:[14] More addition 280 merge:[19] More addition
278 with: [13] More addition 281 with: [17] More addition
279 base: [12] More addition 282 base: [15] More addition
280 perform evolve? [Ny] y 283 perform evolve? [Ny] y
281 hg update -c eacc9c8240fe && 284 hg update -c eacc9c8240fe &&
282 hg merge d2f173e25686 && 285 hg merge d2f173e25686 &&
283 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& 286 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&
284 hg up -C 3932c176bbaa && 287 hg up -C 3932c176bbaa &&
285 hg revert --all --rev tip && 288 hg revert --all --rev tip &&
286 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; 289 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
287 $ hg evolve -v --content-divergent 290 $ hg evolve -v --content-divergent
288 merge:[14] More addition 291 merge:[19] More addition
289 with: [13] More addition 292 with: [17] More addition
290 base: [12] More addition 293 base: [15] More addition
291 merging content-divergent changeset 294 merging divergent changeset
292 resolving manifests 295 resolving manifests
293 merging a 296 merging a
294 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 297 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
295 amending changeset eacc9c8240fe 298 amending changeset eacc9c8240fe
296 committing files: 299 committing files:
297 a 300 a
298 committing manifest 301 committing manifest
299 committing changelog 302 committing changelog
300 committed changeset 15:f344982e63c4 303 copying changeset 283ccd10e2b8 to 7bc2f5967f5e
304 committing files:
305 a
306 committing manifest
307 committing changelog
308 committed changeset 21:f344982e63c4
301 working directory is now at f344982e63c4 309 working directory is now at f344982e63c4
302 $ hg st 310 $ hg st
303 $ glog 311 $ glog
304 @ 15:f344982e63c4@default(draft) bk:[] More addition 312 @ 21:f344982e63c4@default(draft) bk:[] More addition
305 | 313 |
306 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 314 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
307 | | 315 | |
308 o | 7:7bc2f5967f5e@default(draft) bk:[] add c 316 o | 9:7bc2f5967f5e@default(draft) bk:[] add c
309 | | 317 | |
310 | o 6:1cf0aacfd363@default(public) bk:[] newer a 318 | o 8:1cf0aacfd363@default(public) bk:[] newer a
311 |/ 319 |/
312 o 5:66719795a494@default(public) bk:[changea] changea 320 o 7:66719795a494@default(public) bk:[changea] changea
313 | 321 |
314 o 0:07f494440405@default(public) bk:[] adda 322 o 0:07f494440405@default(public) bk:[] adda
315 323
316 $ hg summary 324 $ hg summary
317 parent: 15:f344982e63c4 tip 325 parent: 21:f344982e63c4 tip
318 More addition 326 More addition
319 branch: default 327 branch: default
320 commit: (clean) 328 commit: (clean)
321 update: 2 new changesets, 2 branch heads (merge) 329 update: 2 new changesets, 2 branch heads (merge)
322 phases: 3 draft 330 phases: 3 draft
350 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 358 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
351 working directory parent is obsolete! (3932c176bbaa) 359 working directory parent is obsolete! (3932c176bbaa)
352 (use 'hg evolve' to update to its successor: f344982e63c4) 360 (use 'hg evolve' to update to its successor: f344982e63c4)
353 $ echo 'gotta break' >> a 361 $ echo 'gotta break' >> a
354 $ hg amend 362 $ hg amend
355 2 new content-divergent changesets 363 2 new divergent changesets
356 # reamend so that the case is not the first precursor. 364 # reamend so that the case is not the first precursor.
357 $ hg amend -m "More addition (2)" 365 $ hg amend -m "More addition (2)"
358 $ hg phase 'contentdivergent()' 366 $ hg phase 'contentdivergent()'
359 15: draft 367 21: draft
360 17: draft 368 24: draft
361 $ hg evolve -qn --content-divergent 369 $ hg evolve -qn --content-divergent
362 hg update -c 0b336205a5d0 && 370 hg update -c 0b336205a5d0 &&
363 hg merge f344982e63c4 && 371 hg merge f344982e63c4 &&
364 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& 372 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
365 hg up -C 3932c176bbaa && 373 hg up -C 3932c176bbaa &&
366 hg revert --all --rev tip && 374 hg revert --all --rev tip &&
367 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; 375 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
368 $ hg evolve --content-divergent 376 $ hg evolve --content-divergent
369 merge:[17] More addition (2) 377 merge:[24] More addition (2)
370 with: [15] More addition 378 with: [21] More addition
371 base: [12] More addition 379 base: [15] More addition
372 merging a 380 merging a
373 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 381 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
374 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 382 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
375 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort 383 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort
376 abort: merge conflict between several amendments (this is not automated yet) 384 abort: merge conflict between several amendments (this is not automated yet)