282   $ cd ..

   283 

   284 Continue rebase after upgrading from an hg version before 9c9cfecd4600:

   285 

   286   $ hg clone -q -u . a a4

   287   $ cd a4

   288 

   289   $ hg tglog

   290   @  4: ae36e8e3dfd7 'E'

   291   |

   292   o  3: 46b37eabc604 'D'

   293   |

   294   | o  2: 965c486023db 'C'

   295   | |

   296   | o  1: 27547f69f254 'B'

   297   |/

   298   o  0: 4a2df7238c3b 'A'

   299   

   300   $ hg rebase -s 1 -d 4

   301   rebasing 1:27547f69f254 "B"

   302   rebasing 2:965c486023db "C"

   303   merging A

   304   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

   305   unresolved conflicts (see hg resolve, then hg rebase --continue)

   306   [1]

   307   $ hg tglog

   308   @  5: 45396c49d53b 'B'

   309   |

   310   o  4: ae36e8e3dfd7 'E'

   311   |

   312   o  3: 46b37eabc604 'D'

   313   |

   314   | %  2: 965c486023db 'C'

   315   | |

   316   | o  1: 27547f69f254 'B'

   317   |/

   318   o  0: 4a2df7238c3b 'A'

   319   

   320 Simulate having run the above with an older hg version by manually setting

   321 two dirstate parents. We should not get a merge commit when we continue.

   322   $ hg debugsetparents 5 2

   323   $ echo 'conflict solved' > A

   324   $ hg resolve -m A

   325   (no more unresolved files)

   326   continue: hg rebase --continue

   327   $ hg rebase --continue

   328   already rebased 1:27547f69f254 "B" as 45396c49d53b

   329   rebasing 2:965c486023db "C"

   330   warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db

   331 BROKEN: we should not have a merge commit here

   332   $ hg tglog

   333   o    6: 567335b578a0 'C'

   334   |\

   335   | o  5: 45396c49d53b 'B'

   336   | |

   337   | @  4: ae36e8e3dfd7 'E'

   338   | |

   339   | o  3: 46b37eabc604 'D'

   340   | |

   341   o |  2: 965c486023db 'C'

   342   | |

   343   o |  1: 27547f69f254 'B'

   344   |/

   345   o  0: 4a2df7238c3b 'A'

   346