| changeset 32272 | 78496ac30025 |
| parent 31729 | c069c4e271e3 |
| child 33558 | 0103e7187237 |
| 32271:6096d27dc119 | 32272:78496ac30025 |
|---|---|
296 |/ |
296 |/ |
297 o 1: M1 |
297 o 1: M1 |
298 | |
298 | |
299 o 0: M0 |
299 o 0: M0 |
300 |
300 |
301 Mixed rebasable and non-rebasable bases (unresolved, issue5422): |
|
302 |
|
303 $ rebasewithdag -b C+D -d B <<'EOS' |
|
304 > D |
|
305 > / |
|
306 > B C |
|
307 > |/ |
|
308 > A |
|
309 > EOS |
|
310 nothing to rebase |
|
311 [1] |
|
312 |
|
313 Disconnected graph: |
301 Disconnected graph: |
314 |
302 |
315 $ rebasewithdag -b B -d Z <<'EOS' |
303 $ rebasewithdag -b B -d Z <<'EOS' |
316 > B |
304 > B |
317 > | |
305 > | |