75 merge:[2] added b |
75 merge:[2] added b |
76 with: [3] updated b |
76 with: [3] updated b |
77 base: [1] added b |
77 base: [1] added b |
78 merging b |
78 merging b |
79 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
79 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
80 committed as c1aa9cfb6cf8 |
80 committed as d1939bca1663 |
81 working directory is now at c1aa9cfb6cf8 |
81 working directory is now at d1939bca1663 |
82 |
82 |
83 Following graph log shows that it correctly merged the two divergent csets: |
83 Following graph log shows that it correctly merged the two divergent csets: |
84 |
84 |
85 $ hg glog -p |
85 $ hg glog -p |
86 @ 5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f: |
86 @ 5:d1939bca1663 phase-divergent update to 44f360db368f: |
87 | draft |
87 | draft |
88 | |
88 | |
89 | diff -r 44f360db368f -r c1aa9cfb6cf8 b |
89 | diff -r 44f360db368f -r d1939bca1663 b |
90 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
90 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
91 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
91 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
92 | @@ -1,2 +1,3 @@ |
92 | @@ -1,2 +1,3 @@ |
93 | I am first |
93 | I am first |
94 | b |
94 | b |
179 $ echo "I am foobar" > b |
179 $ echo "I am foobar" > b |
180 $ hg resolve -m --tool union |
180 $ hg resolve -m --tool union |
181 (no more unresolved files) |
181 (no more unresolved files) |
182 continue: hg evolve --continue |
182 continue: hg evolve --continue |
183 $ hg evolve --continue |
183 $ hg evolve --continue |
184 committed as 1a739394e9d4 |
184 committed as c2581b54d60b |
185 working directory is now at 1a739394e9d4 |
185 working directory is now at c2581b54d60b |
186 |
186 |
187 $ hg glog |
187 $ hg glog |
188 @ 5:1a739394e9d4 phase-divergent update to 580f2d01e52c: |
188 @ 5:c2581b54d60b phase-divergent update to 580f2d01e52c: |
189 | draft |
189 | draft |
190 | |
190 | |
191 % 2:580f2d01e52c added b |
191 % 2:580f2d01e52c added b |
192 | public |
192 | public |
193 | |
193 | |
269 merge:[4] added d |
269 merge:[4] added d |
270 with: [5] added d e |
270 with: [5] added d e |
271 base: [3] added d |
271 base: [3] added d |
272 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
272 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
274 committed as 4cbe48a0c3d9 |
274 committed as f725f11cbd60 |
275 working directory is now at 4cbe48a0c3d9 |
275 working directory is now at f725f11cbd60 |
276 |
276 |
277 $ hg glog -l 1 |
277 $ hg glog -l 1 |
278 @ 8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca: |
278 @ 8:f725f11cbd60 phase-divergent update to 93cd84bbdaca: |
279 | draft |
279 | draft |
280 ~ |
280 ~ |
281 |
281 |
282 $ hg evolve -l |
282 $ hg evolve -l |
283 $ cd .. |
283 $ cd .. |
390 continue: hg evolve --continue |
390 continue: hg evolve --continue |
391 |
391 |
392 $ hg evolve --continue |
392 $ hg evolve --continue |
393 evolving 4:f31bcc378766 "added d c e" |
393 evolving 4:f31bcc378766 "added d c e" |
394 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
394 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
395 committed as 412dde898967 |
395 committed as 334db71a5c88 |
396 working directory is now at 412dde898967 |
396 working directory is now at 334db71a5c88 |
397 $ hg export |
397 $ hg export |
398 # HG changeset patch |
398 # HG changeset patch |
399 # User test |
399 # User test |
400 # Date 0 0 |
400 # Date 0 0 |
401 # Thu Jan 01 00:00:00 1970 +0000 |
401 # Thu Jan 01 00:00:00 1970 +0000 |
402 # Node ID 412dde898967b50e7d334aefff778a9af46d29d1 |
402 # Node ID 334db71a5c8882e05b058211106160276f7f4dfc |
403 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
403 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
404 phase-divergent update to 93cd84bbdaca: |
404 phase-divergent update to 93cd84bbdaca: |
405 |
405 |
406 added d c e |
406 added d c e |
407 |
407 |
408 diff -r 93cd84bbdaca -r 412dde898967 e |
408 diff -r 93cd84bbdaca -r 334db71a5c88 e |
409 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
409 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
410 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
410 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
411 @@ -0,0 +1,1 @@ |
411 @@ -0,0 +1,1 @@ |
412 +e |
412 +e |
413 |
413 |
626 $ hg res -m |
626 $ hg res -m |
627 (no more unresolved files) |
627 (no more unresolved files) |
628 continue: hg evolve --continue |
628 continue: hg evolve --continue |
629 |
629 |
630 $ hg evolve --continue |
630 $ hg evolve --continue |
631 committed as b9082a9e66ce |
631 committed as 55e73d2050d5 |
632 working directory is now at 93cd84bbdaca |
632 working directory is now at 93cd84bbdaca |
633 |
633 |
634 $ hg evolve -l |
634 $ hg evolve -l |
635 $ cd .. |
635 $ cd .. |