95 | () draft |
95 | () draft |
96 o 1:c7586e2a9264 added a |
96 o 1:c7586e2a9264 added a |
97 | () draft |
97 | () draft |
98 o 0:8fa14d15e168 added hgignore |
98 o 0:8fa14d15e168 added hgignore |
99 () draft |
99 () draft |
|
100 |
|
101 Content divergence with parent change which will result in conflicts while |
|
102 merging |
|
103 --------------------------------------------------------------------------- |
|
104 |
|
105 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
|
106 rebasing 6:9c1631e352d9 "added d" (tip) |
|
107 |
|
108 $ hg glog |
|
109 @ 7:517d4375cb72 added d |
|
110 | () draft |
|
111 | * 5:e49523854bc8 added d |
|
112 | | () draft |
|
113 | o 3:ca1b80f7960a added c |
|
114 | | () draft |
|
115 | o 2:b1661037fa25 added b |
|
116 |/ () draft |
|
117 o 1:c7586e2a9264 added a |
|
118 | () draft |
|
119 o 0:8fa14d15e168 added hgignore |
|
120 () draft |
|
121 |
|
122 $ hg evolve --content-divergent |
|
123 merge:[5] added d |
|
124 with: [7] added d |
|
125 base: [4] added d |
|
126 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a |
|
127 updating to "local" side of the conflict: e49523854bc8 |
|
128 merging "other" content-divergent changeset '606ad96040fc' |
|
129 merging d |
|
130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
132 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
|
133 [255] |
|
134 |
|
135 $ hg evolve --stop |
|
136 stopped the interrupted evolve |
|
137 working directory is now at e49523854bc8 |
|
138 |
|
139 XXX: we need to strip the relocated commit |
|
140 $ hg glog |
|
141 * 8:606ad96040fc added d |
|
142 | () draft |
|
143 | @ 5:e49523854bc8 added d |
|
144 |/ () draft |
|
145 o 3:ca1b80f7960a added c |
|
146 | () draft |
|
147 o 2:b1661037fa25 added b |
|
148 | () draft |
|
149 o 1:c7586e2a9264 added a |
|
150 | () draft |
|
151 o 0:8fa14d15e168 added hgignore |
|
152 () draft |