135 merge:[4] added c |
135 merge:[4] added c |
136 with: [5] updated c |
136 with: [5] updated c |
137 base: [2] added c |
137 base: [2] added c |
138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 committed as 454f3998cb58 |
140 committed as 0941937e8302 |
141 working directory is now at 454f3998cb58 |
141 working directory is now at 0941937e8302 |
142 |
142 |
143 $ hg glog -p |
143 $ hg glog -p |
144 @ 8:454f3998cb58 phase-divergent update to c0d7ee6604ea: |
144 @ 8:0941937e8302 phase-divergent update to c0d7ee6604ea: |
145 | draft |
145 | draft |
146 | |
146 | |
147 | diff -r c0d7ee6604ea -r 454f3998cb58 c |
147 | diff -r c0d7ee6604ea -r 0941937e8302 c |
148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
150 | @@ -1,1 +1,2 @@ |
150 | @@ -1,1 +1,2 @@ |
151 | c |
151 | c |
152 | +cc |
152 | +cc |
445 $ hg resolve -m d |
445 $ hg resolve -m d |
446 (no more unresolved files) |
446 (no more unresolved files) |
447 continue: hg evolve --continue |
447 continue: hg evolve --continue |
448 |
448 |
449 $ hg evolve --continue |
449 $ hg evolve --continue |
450 committed as 0c67e963324a |
450 committed as bb4d94ae1a5a |
451 working directory is now at 0c67e963324a |
451 working directory is now at bb4d94ae1a5a |
452 |
452 |
453 $ hg export |
453 $ hg export |
454 # HG changeset patch |
454 # HG changeset patch |
455 # User test |
455 # User test |
456 # Date 0 0 |
456 # Date 0 0 |
457 # Thu Jan 01 00:00:00 1970 +0000 |
457 # Thu Jan 01 00:00:00 1970 +0000 |
458 # Node ID 0c67e963324a7f1c84ece16c7d971268b862d8bd |
458 # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560 |
459 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
459 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
460 phase-divergent update to 93cd84bbdaca: |
460 phase-divergent update to 93cd84bbdaca: |
461 |
461 |
462 added c e |
462 added c e |
463 |
463 |
464 diff -r 93cd84bbdaca -r 0c67e963324a d |
464 diff -r 93cd84bbdaca -r bb4d94ae1a5a d |
465 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
465 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
466 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
466 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
467 @@ -1,1 +1,1 @@ |
467 @@ -1,1 +1,1 @@ |
468 -dd |
468 -dd |
469 +resolved |
469 +resolved |
470 diff -r 93cd84bbdaca -r 0c67e963324a e |
470 diff -r 93cd84bbdaca -r bb4d94ae1a5a e |
471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
472 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
472 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
473 @@ -0,0 +1,1 @@ |
473 @@ -0,0 +1,1 @@ |
474 +e |
474 +e |
475 |
475 |