equal
deleted
inserted
replaced
46 working directory parent is obsolete! (c41c793e0ef1) |
46 working directory parent is obsolete! (c41c793e0ef1) |
47 (use 'hg evolve' to update to its successor: e49523854bc8) |
47 (use 'hg evolve' to update to its successor: e49523854bc8) |
48 |
48 |
49 $ echo foobar > d |
49 $ echo foobar > d |
50 $ hg amend |
50 $ hg amend |
51 2 new content-divergent changesets |
51 2 new divergent changesets |
52 $ hg glog --hidden |
52 $ hg glog --hidden |
53 @ 6:9c1631e352d9 added d |
53 @ 8:9c1631e352d9 added d |
54 | () draft |
54 | () draft |
55 | o 5:e49523854bc8 added d |
55 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
56 |/ () draft |
56 | | () draft |
|
57 +---o 6:e49523854bc8 added d |
|
58 | | () draft |
|
59 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
60 | |/ () draft |
57 | x 4:c41c793e0ef1 added d |
61 | x 4:c41c793e0ef1 added d |
58 |/ () draft |
62 |/ () draft |
59 o 3:ca1b80f7960a added c |
63 o 3:ca1b80f7960a added c |
60 | () draft |
64 | () draft |
61 o 2:b1661037fa25 added b |
65 o 2:b1661037fa25 added b |
64 | () draft |
68 | () draft |
65 o 0:8fa14d15e168 added hgignore |
69 o 0:8fa14d15e168 added hgignore |
66 () draft |
70 () draft |
67 |
71 |
68 $ hg evolve --content-divergent |
72 $ hg evolve --content-divergent |
69 merge:[6] added d |
73 merge:[8] added d |
70 with: [5] added d |
74 with: [6] added d |
71 base: [4] added d |
75 base: [4] added d |
72 merging "other" content-divergent changeset 'e49523854bc8' |
76 merging "other" divergent changeset 'e49523854bc8' |
73 merging d |
77 merging d |
74 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
78 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
75 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
79 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
76 fix conflicts and see `hg help evolve.interrupted` |
80 fix conflicts and see `hg help evolve.interrupted` |
77 [1] |
81 [1] |
79 $ hg evolve --stop |
83 $ hg evolve --stop |
80 stopped the interrupted evolve |
84 stopped the interrupted evolve |
81 working directory is now at 9c1631e352d9 |
85 working directory is now at 9c1631e352d9 |
82 |
86 |
83 $ hg glog --hidden |
87 $ hg glog --hidden |
84 @ 6:9c1631e352d9 added d |
88 @ 8:9c1631e352d9 added d |
85 | () draft |
89 | () draft |
86 | o 5:e49523854bc8 added d |
90 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
87 |/ () draft |
91 | | () draft |
|
92 +---o 6:e49523854bc8 added d |
|
93 | | () draft |
|
94 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
95 | |/ () draft |
88 | x 4:c41c793e0ef1 added d |
96 | x 4:c41c793e0ef1 added d |
89 |/ () draft |
97 |/ () draft |
90 o 3:ca1b80f7960a added c |
98 o 3:ca1b80f7960a added c |
91 | () draft |
99 | () draft |
92 o 2:b1661037fa25 added b |
100 o 2:b1661037fa25 added b |
99 Content divergence with parent change which will result in conflicts while |
107 Content divergence with parent change which will result in conflicts while |
100 merging |
108 merging |
101 --------------------------------------------------------------------------- |
109 --------------------------------------------------------------------------- |
102 |
110 |
103 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
111 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
104 rebasing 6:9c1631e352d9 "added d" (tip) |
112 rebasing 8:9c1631e352d9 "added d" (tip) |
105 |
113 |
106 $ hg glog |
114 $ hg glog |
107 @ 7:517d4375cb72 added d |
115 @ 9:517d4375cb72 added d |
108 | () draft |
116 | () draft |
109 | o 5:e49523854bc8 added d |
117 | o 6:e49523854bc8 added d |
110 | | () draft |
118 | | () draft |
111 | o 3:ca1b80f7960a added c |
119 | o 3:ca1b80f7960a added c |
112 | | () draft |
120 | | () draft |
113 | o 2:b1661037fa25 added b |
121 | o 2:b1661037fa25 added b |
114 |/ () draft |
122 |/ () draft |
116 | () draft |
124 | () draft |
117 o 0:8fa14d15e168 added hgignore |
125 o 0:8fa14d15e168 added hgignore |
118 () draft |
126 () draft |
119 |
127 |
120 $ hg evolve --content-divergent |
128 $ hg evolve --content-divergent |
121 merge:[5] added d |
129 merge:[6] added d |
122 with: [7] added d |
130 with: [9] added d |
123 base: [4] added d |
131 base: [4] added d |
124 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a |
132 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a |
125 updating to "local" side of the conflict: e49523854bc8 |
133 updating to "local" side of the conflict: e49523854bc8 |
126 merging "other" content-divergent changeset '606ad96040fc' |
134 merging "other" divergent changeset '606ad96040fc' |
127 merging d |
135 merging d |
128 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
136 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
129 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
137 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
130 fix conflicts and see `hg help evolve.interrupted` |
138 fix conflicts and see `hg help evolve.interrupted` |
131 [1] |
139 [1] |
133 $ hg evolve --stop |
141 $ hg evolve --stop |
134 stopped the interrupted evolve |
142 stopped the interrupted evolve |
135 working directory is now at 517d4375cb72 |
143 working directory is now at 517d4375cb72 |
136 |
144 |
137 $ hg glog |
145 $ hg glog |
138 @ 7:517d4375cb72 added d |
146 @ 9:517d4375cb72 added d |
139 | () draft |
147 | () draft |
140 | o 5:e49523854bc8 added d |
148 | o 6:e49523854bc8 added d |
141 | | () draft |
149 | | () draft |
142 | o 3:ca1b80f7960a added c |
150 | o 3:ca1b80f7960a added c |
143 | | () draft |
151 | | () draft |
144 | o 2:b1661037fa25 added b |
152 | o 2:b1661037fa25 added b |
145 |/ () draft |
153 |/ () draft |
154 |
162 |
155 $ echo babar > c |
163 $ echo babar > c |
156 $ hg add c |
164 $ hg add c |
157 $ hg amend |
165 $ hg amend |
158 $ hg glog |
166 $ hg glog |
159 @ 8:8fd1c4bd144c added d |
167 @ 11:8fd1c4bd144c added d |
160 | () draft |
168 | () draft |
161 | o 5:e49523854bc8 added d |
169 | o 6:e49523854bc8 added d |
162 | | () draft |
170 | | () draft |
163 | o 3:ca1b80f7960a added c |
171 | o 3:ca1b80f7960a added c |
164 | | () draft |
172 | | () draft |
165 | o 2:b1661037fa25 added b |
173 | o 2:b1661037fa25 added b |
166 |/ () draft |
174 |/ () draft |
168 | () draft |
176 | () draft |
169 o 0:8fa14d15e168 added hgignore |
177 o 0:8fa14d15e168 added hgignore |
170 () draft |
178 () draft |
171 |
179 |
172 $ hg evolve --content-divergent |
180 $ hg evolve --content-divergent |
173 merge:[5] added d |
181 merge:[6] added d |
174 with: [8] added d |
182 with: [11] added d |
175 base: [4] added d |
183 base: [4] added d |
176 rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a |
184 rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a |
177 merging c |
185 merging c |
178 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
186 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
179 fix conflicts and see `hg help evolve.interrupted` |
187 fix conflicts and see `hg help evolve.interrupted` |
199 stopped the interrupted evolve |
207 stopped the interrupted evolve |
200 working directory is now at ca1b80f7960a |
208 working directory is now at ca1b80f7960a |
201 |
209 |
202 XXX: we should have preserved the wdir to be at rev 8 |
210 XXX: we should have preserved the wdir to be at rev 8 |
203 $ hg glog |
211 $ hg glog |
204 o 8:8fd1c4bd144c added d |
212 o 11:8fd1c4bd144c added d |
205 | () draft |
213 | () draft |
206 | o 5:e49523854bc8 added d |
214 | o 6:e49523854bc8 added d |
207 | | () draft |
215 | | () draft |
208 | @ 3:ca1b80f7960a added c |
216 | @ 3:ca1b80f7960a added c |
209 | | () draft |
217 | | () draft |
210 | o 2:b1661037fa25 added b |
218 | o 2:b1661037fa25 added b |
211 |/ () draft |
219 |/ () draft |