167 | |
167 | |
168 | o 1: 'dev: create branch' dev |
168 | o 1: 'dev: create branch' dev |
169 |/ |
169 |/ |
170 o 0: 'default: create f-default' |
170 o 0: 'default: create f-default' |
171 |
171 |
|
172 $ cd .. |
|
173 |
|
174 |
|
175 Test order of parents of rebased merged with un-rebased changes as p1. |
|
176 |
|
177 $ hg init parentorder |
|
178 $ cd parentorder |
|
179 $ touch f |
|
180 $ hg ci -Aqm common |
|
181 $ touch change |
|
182 $ hg ci -Aqm change |
|
183 $ touch target |
|
184 $ hg ci -Aqm target |
|
185 $ hg up -qr 0 |
|
186 $ touch outside |
|
187 $ hg ci -Aqm outside |
|
188 $ hg merge -qr 1 |
|
189 $ hg ci -m 'merge p1 3=outside p2 1=ancestor' |
|
190 $ hg par |
|
191 changeset: 4:6990226659be |
|
192 tag: tip |
|
193 parent: 3:f59da8fc0fcf |
|
194 parent: 1:dd40c13f7a6f |
|
195 user: test |
|
196 date: Thu Jan 01 00:00:00 1970 +0000 |
|
197 summary: merge p1 3=outside p2 1=ancestor |
|
198 |
|
199 $ hg up -qr 1 |
|
200 $ hg merge -qr 3 |
|
201 $ hg ci -qm 'merge p1 1=ancestor p2 3=outside' |
|
202 $ hg par |
|
203 changeset: 5:a57575f79074 |
|
204 tag: tip |
|
205 parent: 1:dd40c13f7a6f |
|
206 parent: 3:f59da8fc0fcf |
|
207 user: test |
|
208 date: Thu Jan 01 00:00:00 1970 +0000 |
|
209 summary: merge p1 1=ancestor p2 3=outside |
|
210 |
|
211 $ hg tglog |
|
212 @ 5: 'merge p1 1=ancestor p2 3=outside' |
|
213 |\ |
|
214 +---o 4: 'merge p1 3=outside p2 1=ancestor' |
|
215 | |/ |
|
216 | o 3: 'outside' |
|
217 | | |
|
218 +---o 2: 'target' |
|
219 | | |
|
220 o | 1: 'change' |
|
221 |/ |
|
222 o 0: 'common' |
|
223 |
|
224 $ hg rebase -r 4 -d 2 |
|
225 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) |
|
226 $ hg tip |
|
227 changeset: 5:cca50676b1c5 |
|
228 tag: tip |
|
229 parent: 2:a60552eb93fb |
|
230 parent: 3:f59da8fc0fcf |
|
231 user: test |
|
232 date: Thu Jan 01 00:00:00 1970 +0000 |
|
233 summary: merge p1 3=outside p2 1=ancestor |
|
234 |
|
235 $ hg rebase -r 4 -d 2 |
|
236 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) |
|
237 $ hg tip |
|
238 changeset: 5:f9daf77ffe76 |
|
239 tag: tip |
|
240 parent: 2:a60552eb93fb |
|
241 parent: 3:f59da8fc0fcf |
|
242 user: test |
|
243 date: Thu Jan 01 00:00:00 1970 +0000 |
|
244 summary: merge p1 1=ancestor p2 3=outside |
|
245 |
|
246 $ hg tglog |
|
247 @ 5: 'merge p1 1=ancestor p2 3=outside' |
|
248 |\ |
|
249 +---o 4: 'merge p1 3=outside p2 1=ancestor' |
|
250 | |/ |
|
251 | o 3: 'outside' |
|
252 | | |
|
253 o | 2: 'target' |
|
254 | | |
|
255 o | 1: 'change' |
|
256 |/ |
|
257 o 0: 'common' |
|
258 |