32 |
32 |
33 Creating content-divergence with branch change where base, divergent and other |
33 Creating content-divergence with branch change where base, divergent and other |
34 have different branches |
34 have different branches |
35 ------------------------------------------------------------------------------- |
35 ------------------------------------------------------------------------------- |
36 |
36 |
37 $ hg branch -r . foobar |
37 $ hg branch foobar |
38 changed branch on 1 changesets |
38 marked working directory as branch foobar |
|
39 (branches are permanent and global, did you want a bookmark?) |
|
40 $ hg amend |
39 |
41 |
40 $ hg up c41c793e0ef1 --hidden |
42 $ hg up c41c793e0ef1 --hidden |
41 updating to a hidden changeset c41c793e0ef1 |
|
42 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
|
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44 working directory parent is obsolete! (c41c793e0ef1) |
44 working directory parent is obsolete! (c41c793e0ef1) |
45 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
45 (use 'hg evolve' to update to its successor: bdeedce1f621) |
46 $ echo bar > d |
46 $ echo bar > d |
47 $ hg branch watwat |
47 $ hg branch watwat |
48 marked working directory as branch watwat |
48 marked working directory as branch watwat |
49 $ hg amend |
49 $ hg amend |
50 2 new content-divergent changesets |
50 2 new content-divergent changesets |
51 |
51 |
52 $ hg glog |
52 $ hg glog |
53 @ 6:264b04f771fb added d |
53 @ 6:264b04f771fb added d |
54 | () [watwat] draft |
54 | () [watwat] draft |
55 | * 5:9e5dffcb3d48 added d |
55 | o 5:bdeedce1f621 added d |
56 |/ () [foobar] draft |
56 |/ () [foobar] draft |
57 o 3:ca1b80f7960a added c |
57 o 3:ca1b80f7960a added c |
58 | () [default] draft |
58 | () [default] draft |
59 o 2:b1661037fa25 added b |
59 o 2:b1661037fa25 added b |
60 | () [default] draft |
60 | () [default] draft |
67 > c |
67 > c |
68 > EOF |
68 > EOF |
69 merge:[6] added d |
69 merge:[6] added d |
70 with: [5] added d |
70 with: [5] added d |
71 base: [4] added d |
71 base: [4] added d |
72 merging "other" content-divergent changeset '9e5dffcb3d48' |
72 merging "other" content-divergent changeset 'bdeedce1f621' |
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 content divergent changesets on different branches. |
74 content divergent changesets on different branches. |
75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
76 working directory is now at 0ac42f1bc15c |
76 working directory is now at 0ac42f1bc15c |
77 |
77 |
107 2 new content-divergent changesets |
107 2 new content-divergent changesets |
108 |
108 |
109 $ hg glog |
109 $ hg glog |
110 @ 9:59081c9c425a added a d with bar in it, expect some beers |
110 @ 9:59081c9c425a added a d with bar in it, expect some beers |
111 | () [default] draft |
111 | () [default] draft |
112 | * 8:f621d00f5f0e added d |
112 | o 8:f621d00f5f0e added d |
113 |/ () [foobar] draft |
113 |/ () [foobar] draft |
114 o 3:ca1b80f7960a added c |
114 o 3:ca1b80f7960a added c |
115 | () [default] draft |
115 | () [default] draft |
116 o 2:b1661037fa25 added b |
116 o 2:b1661037fa25 added b |
117 | () [default] draft |
117 | () [default] draft |
144 |
144 |
145 $ echo foo > d |
145 $ echo foo > d |
146 $ hg amend -m "foo to d" |
146 $ hg amend -m "foo to d" |
147 |
147 |
148 $ hg up a9d6fd6b5e40 --hidden |
148 $ hg up a9d6fd6b5e40 --hidden |
149 updating to a hidden changeset a9d6fd6b5e40 |
|
150 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
|
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 working directory parent is obsolete! (a9d6fd6b5e40) |
150 working directory parent is obsolete! (a9d6fd6b5e40) |
153 (use 'hg evolve' to update to its successor: b10b07a394f1) |
151 (use 'hg evolve' to update to its successor: b10b07a394f1) |
154 $ echo babar > d |
152 $ echo babar > d |
155 $ hg amend -m "foo to d" |
153 $ hg amend -m "foo to d" |
156 2 new content-divergent changesets |
154 2 new content-divergent changesets |
157 |
155 |
158 $ hg glog |
156 $ hg glog |
159 @ 12:0bb497fed24a foo to d |
157 @ 12:0bb497fed24a foo to d |
160 | () [default] draft |
158 | () [default] draft |
161 | * 11:b10b07a394f1 foo to d |
159 | o 11:b10b07a394f1 foo to d |
162 |/ () [default] draft |
160 |/ () [default] draft |
163 o 3:ca1b80f7960a added c |
161 o 3:ca1b80f7960a added c |
164 | () [default] draft |
162 | () [default] draft |
165 o 2:b1661037fa25 added b |
163 o 2:b1661037fa25 added b |
166 | () [default] draft |
164 | () [default] draft |
204 |
202 |
205 $ echo bar > d |
203 $ echo bar > d |
206 $ hg amend -m "bar to d, expect beers" |
204 $ hg amend -m "bar to d, expect beers" |
207 |
205 |
208 $ hg up 11175423b5dc --hidden |
206 $ hg up 11175423b5dc --hidden |
209 updating to a hidden changeset 11175423b5dc |
|
210 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
|
211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
212 working directory parent is obsolete! (11175423b5dc) |
208 working directory parent is obsolete! (11175423b5dc) |
213 (use 'hg evolve' to update to its successor: 27f0463f169a) |
209 (use 'hg evolve' to update to its successor: 27f0463f169a) |
214 $ echo wat > d |
210 $ echo wat > d |
215 $ hg amend -m "wat to d, wat?" |
211 $ hg amend -m "wat to d, wat?" |
216 2 new content-divergent changesets |
212 2 new content-divergent changesets |
217 |
213 |
218 $ hg glog |
214 $ hg glog |
219 @ 15:f542037ddf31 wat to d, wat? |
215 @ 15:f542037ddf31 wat to d, wat? |
220 | () [default] draft |
216 | () [default] draft |
221 | * 14:27f0463f169a bar to d, expect beers |
217 | o 14:27f0463f169a bar to d, expect beers |
222 |/ () [default] draft |
218 |/ () [default] draft |
223 o 3:ca1b80f7960a added c |
219 o 3:ca1b80f7960a added c |
224 | () [default] draft |
220 | () [default] draft |
225 o 2:b1661037fa25 added b |
221 o 2:b1661037fa25 added b |
226 | () [default] draft |
222 | () [default] draft |
316 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
317 rebasing 2:b1661037fa25 "added b" |
313 rebasing 2:b1661037fa25 "added b" |
318 2 new content-divergent changesets |
314 2 new content-divergent changesets |
319 |
315 |
320 $ hg glog |
316 $ hg glog |
321 * 6:da4b96f4a8d6 added b |
317 o 6:da4b96f4a8d6 added b |
322 | () [default] draft |
318 | () [default] draft |
323 | @ 5:7ed0642d644b added b |
319 | @ 5:7ed0642d644b added b |
324 | | () [default] draft |
320 | | () [default] draft |
325 | | * 4:c41c793e0ef1 added d |
321 | | o 4:c41c793e0ef1 added d |
326 | | | () [default] draft |
322 | | | () [default] draft |
327 | | * 3:ca1b80f7960a added c |
323 | | o 3:ca1b80f7960a added c |
328 | | | () [default] draft |
324 | | | () [default] draft |
329 | | x 2:b1661037fa25 added b |
325 | | x 2:b1661037fa25 added b |
330 | |/ () [default] draft |
326 | |/ () [default] draft |
331 | o 1:c7586e2a9264 added a |
327 | o 1:c7586e2a9264 added a |
332 |/ () [default] draft |
328 |/ () [default] draft |
344 working directory is now at 171614c9a791 |
340 working directory is now at 171614c9a791 |
345 |
341 |
346 $ hg glog |
342 $ hg glog |
347 @ 8:171614c9a791 added b |
343 @ 8:171614c9a791 added b |
348 | () [default] draft |
344 | () [default] draft |
349 | * 4:c41c793e0ef1 added d |
345 | o 4:c41c793e0ef1 added d |
350 | | () [default] draft |
346 | | () [default] draft |
351 | * 3:ca1b80f7960a added c |
347 | o 3:ca1b80f7960a added c |
352 | | () [default] draft |
348 | | () [default] draft |
353 | x 2:b1661037fa25 added b |
349 | x 2:b1661037fa25 added b |
354 |/ () [default] draft |
350 |/ () [default] draft |
355 o 1:c7586e2a9264 added a |
351 o 1:c7586e2a9264 added a |
356 | () [default] draft |
352 | () [default] draft |
408 marked working directory as branch bar |
404 marked working directory as branch bar |
409 (branches are permanent and global, did you want a bookmark?) |
405 (branches are permanent and global, did you want a bookmark?) |
410 $ hg amend -m "added foo to x" |
406 $ hg amend -m "added foo to x" |
411 |
407 |
412 $ hg up 71a392c714b5 --hidden |
408 $ hg up 71a392c714b5 --hidden |
413 updating to a hidden changeset 71a392c714b5 |
|
414 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
|
415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
416 working directory parent is obsolete! (71a392c714b5) |
410 working directory parent is obsolete! (71a392c714b5) |
417 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
411 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
418 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
412 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
419 rebasing 11:71a392c714b5 "added x" |
413 rebasing 11:71a392c714b5 "added x" |
420 2 new content-divergent changesets |
414 2 new content-divergent changesets |
421 |
415 |
422 $ hg glog |
416 $ hg glog |
423 @ 13:1e4f6b3bb39b added x |
417 @ 13:1e4f6b3bb39b added x |
424 | () [default] draft |
418 | () [default] draft |
425 | * 12:1e1a50385a7d added foo to x |
419 | o 12:1e1a50385a7d added foo to x |
426 | | () [bar] draft |
420 | | () [bar] draft |
427 o | 10:4ae4427ee9f8 added d |
421 o | 10:4ae4427ee9f8 added d |
428 | | () [default] draft |
422 | | () [default] draft |
429 o | 9:917281f93fcb added c |
423 o | 9:917281f93fcb added c |
430 |/ () [default] draft |
424 |/ () [default] draft |
493 |
487 |
494 $ echo bar > y |
488 $ echo bar > y |
495 $ hg amend |
489 $ hg amend |
496 |
490 |
497 $ hg up fc6ad2bac162 --hidden |
491 $ hg up fc6ad2bac162 --hidden |
498 updating to a hidden changeset fc6ad2bac162 |
|
499 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
|
500 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
501 working directory parent is obsolete! (fc6ad2bac162) |
493 working directory parent is obsolete! (fc6ad2bac162) |
502 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
494 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
503 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
495 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
504 rebasing 16:fc6ad2bac162 "added y" |
496 rebasing 16:fc6ad2bac162 "added y" |
507 $ hg amend |
499 $ hg amend |
508 |
500 |
509 $ hg glog |
501 $ hg glog |
510 @ 19:b4575ed6fcfc added y |
502 @ 19:b4575ed6fcfc added y |
511 | () [bar] draft |
503 | () [bar] draft |
512 | * 17:2a9f6ccbdeba added y |
504 | o 17:2a9f6ccbdeba added y |
513 | | () [default] draft |
505 | | () [default] draft |
514 o | 15:b006cf317e0e added foo to x |
506 o | 15:b006cf317e0e added foo to x |
515 | | () [bar] draft |
507 | | () [bar] draft |
516 o | 10:4ae4427ee9f8 added d |
508 o | 10:4ae4427ee9f8 added d |
517 | | () [default] draft |
509 | | () [default] draft |
628 $ echo foo > y |
620 $ echo foo > y |
629 $ hg add y |
621 $ hg add y |
630 $ hg amend |
622 $ hg amend |
631 |
623 |
632 $ hg up daf1de08f3b0 --hidden |
624 $ hg up daf1de08f3b0 --hidden |
633 updating to a hidden changeset daf1de08f3b0 |
|
634 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
|
635 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
625 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
636 working directory parent is obsolete! (daf1de08f3b0) |
626 working directory parent is obsolete! (daf1de08f3b0) |
637 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
627 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
638 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
628 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
639 rebasing 22:daf1de08f3b0 "added z" |
629 rebasing 22:daf1de08f3b0 "added z" |
642 $ hg amend |
632 $ hg amend |
643 |
633 |
644 $ hg glog |
634 $ hg glog |
645 @ 25:53242575ffa9 added z |
635 @ 25:53242575ffa9 added z |
646 | () [bar] draft |
636 | () [bar] draft |
647 | * 23:3f7a1f693080 added z |
637 | o 23:3f7a1f693080 added z |
648 | | () [default] draft |
638 | | () [default] draft |
649 o | 21:7bbcf24ddecf added y |
639 o | 21:7bbcf24ddecf added y |
650 | | () [bar] draft |
640 | | () [bar] draft |
651 o | 15:b006cf317e0e added foo to x |
641 o | 15:b006cf317e0e added foo to x |
652 | | () [bar] draft |
642 | | () [bar] draft |
867 adding changesets |
857 adding changesets |
868 adding manifests |
858 adding manifests |
869 adding file changes |
859 adding file changes |
870 added 4 changesets with 0 changes to 4 files (+1 heads) |
860 added 4 changesets with 0 changes to 4 files (+1 heads) |
871 5 new obsolescence markers |
861 5 new obsolescence markers |
872 8 new content-divergent changesets |
|
873 new changesets 82b74d5dc678:15c781f93cac |
862 new changesets 82b74d5dc678:15c781f93cac |
874 (run 'hg heads' to see heads, 'hg merge' to merge) |
863 (run 'hg heads' to see heads, 'hg merge' to merge) |
875 |
864 8 new content-divergent changesets |
876 $ hg glog |
865 |
877 * 12:15c781f93cac added d |
866 $ hg glog |
878 | () [default] draft |
867 o 12:15c781f93cac added d |
879 * 11:9e5fb1d5b955 added c |
868 | () [default] draft |
880 | () [default] draft |
869 o 11:9e5fb1d5b955 added c |
881 * 10:88516dccf68a added b |
870 | () [default] draft |
882 | () [default] draft |
871 o 10:88516dccf68a added b |
883 * 9:82b74d5dc678 watbar to a |
872 | () [default] draft |
|
873 o 9:82b74d5dc678 watbar to a |
884 | () [default] draft |
874 | () [default] draft |
885 | @ 8:c72d2885eb51 added d |
875 | @ 8:c72d2885eb51 added d |
886 | | () [default] draft |
876 | | () [default] draft |
887 | * 7:3ce4be6d8e5e added c |
877 | o 7:3ce4be6d8e5e added c |
888 | | () [default] draft |
878 | | () [default] draft |
889 | * 6:d5f148423c16 added b |
879 | o 6:d5f148423c16 added b |
890 | | () [default] draft |
880 | | () [default] draft |
891 | * 5:8e222f257bbf watbar to a |
881 | o 5:8e222f257bbf watbar to a |
892 |/ () [default] draft |
882 |/ () [default] draft |
893 o 0:8fa14d15e168 added hgignore |
883 o 0:8fa14d15e168 added hgignore |
894 () [default] draft |
884 () [default] draft |
895 |
885 |
896 $ hg evolve --all --content-divergent |
886 $ hg evolve --all --content-divergent |
898 with: [9] watbar to a |
888 with: [9] watbar to a |
899 base: [1] added a |
889 base: [1] added a |
900 updating to "local" side of the conflict: 8e222f257bbf |
890 updating to "local" side of the conflict: 8e222f257bbf |
901 merging "other" content-divergent changeset '82b74d5dc678' |
891 merging "other" content-divergent changeset '82b74d5dc678' |
902 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
892 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
903 6 new orphan changesets |
|
904 merge:[6] added b |
893 merge:[6] added b |
905 with: [10] added b |
894 with: [10] added b |
906 base: [2] added b |
895 base: [2] added b |
907 updating to "local" side of the conflict: d5f148423c16 |
896 updating to "local" side of the conflict: d5f148423c16 |
908 merging "other" content-divergent changeset '88516dccf68a' |
897 merging "other" content-divergent changeset '88516dccf68a' |