Mercurial > evolve

comparison tests/test-evolve-content-divergent-relocation.t @ 5572:d7d954b6d518

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove swapping nodes logic while resolving divergence Before this patch, while solving content-divergence if one of the divergent cset need to relocate to resolution parent we used to set that cset to "other" side; so it was like we are always going to relocate "other" side which made us to swap the two if "divergent" cset need to relocate. Above mentioned solution for relocating cset was not good and led us to incorrect output in some cases. So this patch, simplify the logic and remove the swapping thing and clearly depend on resolution parent to check if any of the divergent cset needs to relocate. This also means that now in some cases if both the divergent csets needs to relocate, both will be relocated. Even before this patch, there are some cases where both the divergent csets relocated but not in every case where it should have. Coming to the changes in test files: 1) changes in order of merging the two divergent csets is due to fact that now "divergent" and "other" are not swapped and hence "divergent" will be at local side and "other" will be at "other", which also results in change in the hash id for some cases. 2) extra changesets: which is the result of the fact that now we don't miss any case where both the divergent csets should be based on resolution parent before performing the merge -> which caught some cases and performed relocation, hence extra changesets. Although you can find that there is no changes in file content because of these relocation, but I remember loosing some data because of not relocating the "divergent", so why leave any risk out there by not relocating "other" to the resolution parent.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sun, 20 Sep 2020 09:22:04 +0530
parents e8660b28bfee
children 8d93e7fc0daa c2fab88e6d60
comparison
equal deleted inserted replaced
5571:b2de5825e5ca 5572:d7d954b6d518
182 | () [default] draft 182 | () [default] draft
183 o 0:8fa14d15e168 added hgignore 183 o 0:8fa14d15e168 added hgignore
184 () [default] draft 184 () [default] draft
185 185
186 $ hg evolve --content-divergent 186 $ hg evolve --content-divergent
187 merge:[13] added x 187 merge:[12] added foo to x
188 with: [12] added foo to x 188 with: [13] added x
189 base: [11] added x 189 base: [11] added x
190 rebasing "other" content-divergent changeset 5cf74a13db18 on be5a8b9faa8a 190 rebasing "divergent" content-divergent changeset 5cf74a13db18 on be5a8b9faa8a
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 191 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
192 working directory is now at 4e844ab5e814 192 working directory is now at 618f8bd245a8
193 193
194 $ hg exp 194 $ hg exp
195 # HG changeset patch 195 # HG changeset patch
196 # User test 196 # User test
197 # Date 0 0 197 # Date 0 0
198 # Thu Jan 01 00:00:00 1970 +0000 198 # Thu Jan 01 00:00:00 1970 +0000
199 # Branch bar 199 # Branch bar
200 # Node ID 4e844ab5e8142d26fb1f0990486379f2410b0358 200 # Node ID 618f8bd245a8d1892954eb49a88a6ec5e500a5b5
201 # Parent be5a8b9faa8af54f115aa168a2c8564acb40c37d 201 # Parent be5a8b9faa8af54f115aa168a2c8564acb40c37d
202 added foo to x 202 added foo to x
203 203
204 diff -r be5a8b9faa8a -r 4e844ab5e814 x 204 diff -r be5a8b9faa8a -r 618f8bd245a8 x
205 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 205 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
206 +++ b/x Thu Jan 01 00:00:00 1970 +0000 206 +++ b/x Thu Jan 01 00:00:00 1970 +0000
207 @@ -0,0 +1,1 @@ 207 @@ -0,0 +1,1 @@
208 +foo 208 +foo
209 209
210 The above `hg exp` and the following log call demonstrates that message, content 210 The above `hg exp` and the following log call demonstrates that message, content
211 and branch change is preserved in case of relocation 211 and branch change is preserved in case of relocation
212 $ hg glog 212 $ hg glog
213 @ 15:4e844ab5e814 added foo to x 213 @ 15:618f8bd245a8 added foo to x
214 | () [bar] draft 214 | () [bar] draft
215 o 10:be5a8b9faa8a added d 215 o 10:be5a8b9faa8a added d
216 | () [default] draft 216 | () [default] draft
217 o 9:e2ce33033e42 added c 217 o 9:e2ce33033e42 added c
218 | () [default] draft 218 | () [default] draft
232 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 232 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
233 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 233 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
234 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} 234 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
235 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 235 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
236 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 236 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
237 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} 237 911c21adca136894a2b35f0a58fae7ee94fa5e61 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
238 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 238 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
239 $ hg obslog --all 239 $ hg obslog --all
240 @ 4e844ab5e814 (15) added foo to x 240 @ 618f8bd245a8 (15) added foo to x
241 |\ rewritten(description, branch, content) from 45e15d6e88f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 241 |\ rewritten(description, branch, content) from 45e15d6e88f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
242 | | rewritten from 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 242 | | rewritten from 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
243 | | 243 | |
244 x | 45e15d6e88f5 (13) added x 244 x | 45e15d6e88f5 (13) added x
245 | | rebased(parent) from 801b5920c7ea using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 245 | | rebased(parent) from 801b5920c7ea using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
281 2 new content-divergent changesets 281 2 new content-divergent changesets
282 $ echo wat > y 282 $ echo wat > y
283 $ hg amend 283 $ hg amend
284 284
285 $ hg glog 285 $ hg glog
286 @ 19:0faa43228ee7 added y 286 @ 19:bfe170c9c964 added y
287 | () [bar] draft 287 | () [bar] draft
288 | * 17:9c32d35206fb added y 288 | * 17:9c32d35206fb added y
289 | | () [default] draft 289 | | () [default] draft
290 o | 15:4e844ab5e814 added foo to x 290 o | 15:618f8bd245a8 added foo to x
291 | | () [bar] draft 291 | | () [bar] draft
292 o | 10:be5a8b9faa8a added d 292 o | 10:be5a8b9faa8a added d
293 | | () [default] draft 293 | | () [default] draft
294 o | 9:e2ce33033e42 added c 294 o | 9:e2ce33033e42 added c
295 |/ () [default] draft 295 |/ () [default] draft
299 | () [default] draft 299 | () [default] draft
300 o 0:8fa14d15e168 added hgignore 300 o 0:8fa14d15e168 added hgignore
301 () [default] draft 301 () [default] draft
302 302
303 $ hg evolve --content-divergent 303 $ hg evolve --content-divergent
304 merge:[19] added y 304 merge:[17] added y
305 with: [17] added y 305 with: [19] added y
306 base: [16] added y 306 base: [16] added y
307 rebasing "other" content-divergent changeset 9c32d35206fb on 4e844ab5e814 307 rebasing "divergent" content-divergent changeset 9c32d35206fb on 618f8bd245a8
308 merging y 308 merging y
309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
311 unresolved merge conflicts 311 unresolved merge conflicts
312 (see 'hg help evolve.interrupted') 312 (see 'hg help evolve.interrupted')
315 $ echo watbar > y 315 $ echo watbar > y
316 $ hg resolve -m 316 $ hg resolve -m
317 (no more unresolved files) 317 (no more unresolved files)
318 continue: hg evolve --continue 318 continue: hg evolve --continue
319 $ hg evolve --continue 319 $ hg evolve --continue
320 working directory is now at ba11a9f47a2e 320 working directory is now at 7411ed2cf7cf
321 321
322 $ hg glog 322 $ hg glog
323 @ 21:ba11a9f47a2e added y 323 @ 21:7411ed2cf7cf added y
324 | () [bar] draft 324 | () [bar] draft
325 o 15:4e844ab5e814 added foo to x 325 o 15:618f8bd245a8 added foo to x
326 | () [bar] draft 326 | () [bar] draft
327 o 10:be5a8b9faa8a added d 327 o 10:be5a8b9faa8a added d
328 | () [default] draft 328 | () [default] draft
329 o 9:e2ce33033e42 added c 329 o 9:e2ce33033e42 added c
330 | () [default] draft 330 | () [default] draft
344 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 344 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
345 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 345 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
346 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} 346 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
347 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 347 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
348 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 348 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
349 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} 349 911c21adca136894a2b35f0a58fae7ee94fa5e61 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
350 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 350 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
351 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 351 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
352 ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} 352 ecf1d3992eb4d9700d441013fc4e89014692b461 491e9c6e22a4f265fad54d2060b9c2fa45f4301d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
353 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 353 491e9c6e22a4f265fad54d2060b9c2fa45f4301d bfe170c9c96484157a071cd74e400426376c5e0e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
354 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 354 9c32d35206fb5c3bf0ac814d410914d54a959a87 7c47d5c3b6f5fb934723cdeb45c5819760988e1d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
355 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} 355 7c47d5c3b6f5fb934723cdeb45c5819760988e1d 7411ed2cf7cfbc23f17711a72570787569177d69 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
356 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} 356 bfe170c9c96484157a071cd74e400426376c5e0e 7411ed2cf7cfbc23f17711a72570787569177d69 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
357 $ hg obslog -r . --all 357 $ hg obslog -r . --all
358 @ ba11a9f47a2e (21) added y 358 @ 7411ed2cf7cf (21) added y
359 |\ amended(content) from 0faa43228ee7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 359 |\ rewritten(branch, content) from 7c47d5c3b6f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
360 | | rewritten(branch, content) from 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 360 | | amended(content) from bfe170c9c964 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
361 | | 361 | |
362 x | 0faa43228ee7 (19) added y 362 x | 7c47d5c3b6f5 (20) added y
363 | | amended(content) from 1bb931596137 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
364 | |
365 | x 0fc12918c8da (20) added y
366 | | rebased(parent) from 9c32d35206fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 363 | | rebased(parent) from 9c32d35206fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
367 | | 364 | |
368 x | 1bb931596137 (18) added y 365 | x bfe170c9c964 (19) added y
366 | | amended(content) from 491e9c6e22a4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
367 | |
368 | x 491e9c6e22a4 (18) added y
369 | | rewritten(branch, parent) from ecf1d3992eb4 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 369 | | rewritten(branch, parent) from ecf1d3992eb4 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
370 | | 370 | |
371 | x 9c32d35206fb (17) added y 371 x | 9c32d35206fb (17) added y
372 |/ amended(content) from ecf1d3992eb4 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 372 |/ amended(content) from ecf1d3992eb4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
373 | 373 |
374 x ecf1d3992eb4 (16) added y 374 x ecf1d3992eb4 (16) added y
375 375
376 376
378 $ hg exp 20 --hidden 378 $ hg exp 20 --hidden
379 # HG changeset patch 379 # HG changeset patch
380 # User test 380 # User test
381 # Date 0 0 381 # Date 0 0
382 # Thu Jan 01 00:00:00 1970 +0000 382 # Thu Jan 01 00:00:00 1970 +0000
383 # Node ID 0fc12918c8daa12ca83ce1e2a38e252b063b6276 383 # Node ID 7c47d5c3b6f5fb934723cdeb45c5819760988e1d
384 # Parent 4e844ab5e8142d26fb1f0990486379f2410b0358 384 # Parent 618f8bd245a8d1892954eb49a88a6ec5e500a5b5
385 added y 385 added y
386 386
387 diff -r 4e844ab5e814 -r 0fc12918c8da y 387 diff -r 618f8bd245a8 -r 7c47d5c3b6f5 y
388 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 388 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
389 +++ b/y Thu Jan 01 00:00:00 1970 +0000 389 +++ b/y Thu Jan 01 00:00:00 1970 +0000
390 @@ -0,0 +1,1 @@ 390 @@ -0,0 +1,1 @@
391 +bar 391 +bar
392 392
393 Testing when the relocation will result in conflicts and merging also: 393 Testing when the relocation will result in conflicts and merging also:
394 ---------------------------------------------------------------------- 394 ----------------------------------------------------------------------
395 395
396 $ hg glog 396 $ hg glog
397 @ 21:ba11a9f47a2e added y 397 @ 21:7411ed2cf7cf added y
398 | () [bar] draft 398 | () [bar] draft
399 o 15:4e844ab5e814 added foo to x 399 o 15:618f8bd245a8 added foo to x
400 | () [bar] draft 400 | () [bar] draft
401 o 10:be5a8b9faa8a added d 401 o 10:be5a8b9faa8a added d
402 | () [default] draft 402 | () [default] draft
403 o 9:e2ce33033e42 added c 403 o 9:e2ce33033e42 added c
404 | () [default] draft 404 | () [default] draft
434 2 new content-divergent changesets 434 2 new content-divergent changesets
435 $ echo bar > z 435 $ echo bar > z
436 $ hg amend 436 $ hg amend
437 437
438 $ hg glog 438 $ hg glog
439 @ 25:ad2ec16eca1e added z 439 @ 25:40a21b3496bc added z
440 | () [bar] draft 440 | () [bar] draft
441 | * 23:9bc2ace42175 added z 441 | * 23:9bc2ace42175 added z
442 | | () [default] draft 442 | | () [default] draft
443 o | 21:ba11a9f47a2e added y 443 o | 21:7411ed2cf7cf added y
444 | | () [bar] draft 444 | | () [bar] draft
445 o | 15:4e844ab5e814 added foo to x 445 o | 15:618f8bd245a8 added foo to x
446 | | () [bar] draft 446 | | () [bar] draft
447 o | 10:be5a8b9faa8a added d 447 o | 10:be5a8b9faa8a added d
448 | | () [default] draft 448 | | () [default] draft
449 o | 9:e2ce33033e42 added c 449 o | 9:e2ce33033e42 added c
450 |/ () [default] draft 450 |/ () [default] draft
454 | () [default] draft 454 | () [default] draft
455 o 0:8fa14d15e168 added hgignore 455 o 0:8fa14d15e168 added hgignore
456 () [default] draft 456 () [default] draft
457 457
458 $ hg evolve --content-divergent --any 458 $ hg evolve --content-divergent --any
459 merge:[25] added z 459 merge:[23] added z
460 with: [23] added z 460 with: [25] added z
461 base: [22] added z 461 base: [22] added z
462 rebasing "other" content-divergent changeset 9bc2ace42175 on ba11a9f47a2e 462 rebasing "divergent" content-divergent changeset 9bc2ace42175 on 7411ed2cf7cf
463 merging y 463 merging y
464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
465 unresolved merge conflicts 465 unresolved merge conflicts
466 (see 'hg help evolve.interrupted') 466 (see 'hg help evolve.interrupted')
467 [1] 467 [1]
468 468
469 $ hg diff 469 $ hg diff
470 diff -r ba11a9f47a2e y 470 diff -r 7411ed2cf7cf y
471 --- a/y Thu Jan 01 00:00:00 1970 +0000 471 --- a/y Thu Jan 01 00:00:00 1970 +0000
472 +++ b/y Thu Jan 01 00:00:00 1970 +0000 472 +++ b/y Thu Jan 01 00:00:00 1970 +0000
473 @@ -1,1 +1,5 @@ 473 @@ -1,1 +1,5 @@
474 +<<<<<<< destination: ba11a9f47a2e bar - test: added y 474 +<<<<<<< destination: 7411ed2cf7cf bar - test: added y
475 watbar 475 watbar
476 +======= 476 +=======
477 +foo 477 +foo
478 +>>>>>>> evolving: 9bc2ace42175 - test: added z 478 +>>>>>>> evolving: 9bc2ace42175 - test: added z
479 diff -r ba11a9f47a2e z 479 diff -r 7411ed2cf7cf z
480 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 480 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
481 +++ b/z Thu Jan 01 00:00:00 1970 +0000 481 +++ b/z Thu Jan 01 00:00:00 1970 +0000
482 @@ -0,0 +1,1 @@ 482 @@ -0,0 +1,1 @@
483 +z 483 +z
484 484
489 489
490 $ hg evolve --continue 490 $ hg evolve --continue
491 evolving 23:9bc2ace42175 "added z" 491 evolving 23:9bc2ace42175 "added z"
492 merging y 492 merging y
493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
494 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 494 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
495 unresolved merge conflicts 495 unresolved merge conflicts
496 (see 'hg help evolve.interrupted') 496 (see 'hg help evolve.interrupted')
497 [1] 497 [1]
498 498
499 $ hg diff 499 $ hg diff
500 diff -r ad2ec16eca1e y 500 diff -r 635c0edd2e45 y
501 --- a/y Thu Jan 01 00:00:00 1970 +0000 501 --- a/y Thu Jan 01 00:00:00 1970 +0000
502 +++ b/y Thu Jan 01 00:00:00 1970 +0000 502 +++ b/y Thu Jan 01 00:00:00 1970 +0000
503 @@ -1,1 +1,5 @@ 503 @@ -1,1 +1,5 @@
504 +<<<<<<< local: ad2ec16eca1e bar - test: added z 504 +<<<<<<< local: 635c0edd2e45 - test: added z
505 watbar 505 foo
506 +======= 506 +=======
507 +foo 507 +watbar
508 +>>>>>>> other: a7326a078527 - test: added z 508 +>>>>>>> other: 40a21b3496bc bar - test: added z
509 diff -r 635c0edd2e45 z
510 --- a/z Thu Jan 01 00:00:00 1970 +0000
511 +++ b/z Thu Jan 01 00:00:00 1970 +0000
512 @@ -1,1 +1,1 @@
513 -z
514 +bar
509 515
510 $ echo foo > y 516 $ echo foo > y
511 $ hg resolve -m 517 $ hg resolve -m
512 (no more unresolved files) 518 (no more unresolved files)
513 continue: hg evolve --continue 519 continue: hg evolve --continue
514 $ hg evolve --continue 520 $ hg evolve --continue
515 working directory is now at 45e55c9ab3d0 521 working directory is now at 664febd074c2
516 522
517 $ hg glog 523 $ hg glog
518 @ 27:45e55c9ab3d0 added z 524 @ 27:664febd074c2 added z
519 | () [bar] draft 525 | () [bar] draft
520 o 21:ba11a9f47a2e added y 526 o 21:7411ed2cf7cf added y
521 | () [bar] draft 527 | () [bar] draft
522 o 15:4e844ab5e814 added foo to x 528 o 15:618f8bd245a8 added foo to x
523 | () [bar] draft 529 | () [bar] draft
524 o 10:be5a8b9faa8a added d 530 o 10:be5a8b9faa8a added d
525 | () [default] draft 531 | () [default] draft
526 o 9:e2ce33033e42 added c 532 o 9:e2ce33033e42 added c
527 | () [default] draft 533 | () [default] draft
536 # HG changeset patch 542 # HG changeset patch
537 # User test 543 # User test
538 # Date 0 0 544 # Date 0 0
539 # Thu Jan 01 00:00:00 1970 +0000 545 # Thu Jan 01 00:00:00 1970 +0000
540 # Branch bar 546 # Branch bar
541 # Node ID 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 547 # Node ID 664febd074c2f9c5c4e03045dd688e93360f297c
542 # Parent ba11a9f47a2e4a3380c4d5f80f64de41645a6681 548 # Parent 7411ed2cf7cfbc23f17711a72570787569177d69
543 added z 549 added z
544 550
545 diff -r ba11a9f47a2e -r 45e55c9ab3d0 y 551 diff -r 7411ed2cf7cf -r 664febd074c2 y
546 --- a/y Thu Jan 01 00:00:00 1970 +0000 552 --- a/y Thu Jan 01 00:00:00 1970 +0000
547 +++ b/y Thu Jan 01 00:00:00 1970 +0000 553 +++ b/y Thu Jan 01 00:00:00 1970 +0000
548 @@ -1,1 +1,1 @@ 554 @@ -1,1 +1,1 @@
549 -watbar 555 -watbar
550 +foo 556 +foo
551 diff -r ba11a9f47a2e -r 45e55c9ab3d0 z 557 diff -r 7411ed2cf7cf -r 664febd074c2 z
552 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 558 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
553 +++ b/z Thu Jan 01 00:00:00 1970 +0000 559 +++ b/z Thu Jan 01 00:00:00 1970 +0000
554 @@ -0,0 +1,1 @@ 560 @@ -0,0 +1,1 @@
555 +bar 561 +bar
556 562
563 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 569 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
564 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 570 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
565 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} 571 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
566 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 572 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
567 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 573 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
568 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} 574 911c21adca136894a2b35f0a58fae7ee94fa5e61 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
569 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 575 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 618f8bd245a8d1892954eb49a88a6ec5e500a5b5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
570 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 576 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
571 ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} 577 ecf1d3992eb4d9700d441013fc4e89014692b461 491e9c6e22a4f265fad54d2060b9c2fa45f4301d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
572 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 578 491e9c6e22a4f265fad54d2060b9c2fa45f4301d bfe170c9c96484157a071cd74e400426376c5e0e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
573 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 579 9c32d35206fb5c3bf0ac814d410914d54a959a87 7c47d5c3b6f5fb934723cdeb45c5819760988e1d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
574 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} 580 7c47d5c3b6f5fb934723cdeb45c5819760988e1d 7411ed2cf7cfbc23f17711a72570787569177d69 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
575 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} 581 bfe170c9c96484157a071cd74e400426376c5e0e 7411ed2cf7cfbc23f17711a72570787569177d69 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
576 2048a66e8834bda866dcc8c479f091897816833e 9bc2ace42175da7380251fca97730f62ff5b9185 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 582 2048a66e8834bda866dcc8c479f091897816833e 9bc2ace42175da7380251fca97730f62ff5b9185 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
577 2048a66e8834bda866dcc8c479f091897816833e ee19d6cc67048a1a7469268068a1413611720975 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} 583 2048a66e8834bda866dcc8c479f091897816833e 8bf0130be95ef72377e39232335531426c2abcf9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
578 ee19d6cc67048a1a7469268068a1413611720975 ad2ec16eca1eac4cf5045b496efa6205652e9a02 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 584 8bf0130be95ef72377e39232335531426c2abcf9 40a21b3496bc55fd0c0ac92d81b2930cfa4d4bef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
579 9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} 585 9bc2ace42175da7380251fca97730f62ff5b9185 635c0edd2e45de215b2061b30aae5168708238d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
580 ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} 586 635c0edd2e45de215b2061b30aae5168708238d3 664febd074c2f9c5c4e03045dd688e93360f297c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
581 a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} 587 40a21b3496bc55fd0c0ac92d81b2930cfa4d4bef 664febd074c2f9c5c4e03045dd688e93360f297c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
582 $ hg obslog --all 588 $ hg obslog --all
583 @ 45e55c9ab3d0 (27) added z 589 @ 664febd074c2 (27) added z
584 |\ rewritten(branch, content) from a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 590 |\ amended(content) from 40a21b3496bc using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
585 | | amended(content) from ad2ec16eca1e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 591 | | rewritten(branch, content) from 635c0edd2e45 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
586 | | 592 | |
587 x | a7326a078527 (26) added z 593 x | 40a21b3496bc (25) added z
594 | | amended(content) from 8bf0130be95e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
595 | |
596 | x 635c0edd2e45 (26) added z
588 | | rewritten(parent, content) from 9bc2ace42175 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 597 | | rewritten(parent, content) from 9bc2ace42175 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
589 | | 598 | |
590 | x ad2ec16eca1e (25) added z 599 x | 8bf0130be95e (24) added z
591 | | amended(content) from ee19d6cc6704 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 600 | | rewritten(branch, parent) from 2048a66e8834 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
592 | | 601 | |
593 x | 9bc2ace42175 (23) added z 602 | x 9bc2ace42175 (23) added z
594 | | amended(content) from 2048a66e8834 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 603 |/ amended(content) from 2048a66e8834 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
595 | |
596 | x ee19d6cc6704 (24) added z
597 |/ rewritten(branch, parent) from 2048a66e8834 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
598 | 604 |
599 x 2048a66e8834 (22) added z 605 x 2048a66e8834 (22) added z
600 606
601 607
602 $ cd .. 608 $ cd ..