Skip to content
Snippets Groups Projects
  • Pierre-Yves David's avatar
    9c78ed39
    rebase: preserve working directory parent (BC) · 9c78ed39
    Pierre-Yves David authored
    Prior to this changeset, rebase always left the working directory as a parent of
    the last rebased changeset. The is dubious when, before the rebase, the working
    directory was not a parent of the tip most rebased changeset.
    
    With this changeset, we move the working directory back to its original parent.
    If the original parent was rebased, we use it's successors.
    
    This is a step toward solving issue3813 (rebase loses active bookmark if it's
    not on a head)
    9c78ed39
    History
    rebase: preserve working directory parent (BC)
    Pierre-Yves David authored
    Prior to this changeset, rebase always left the working directory as a parent of
    the last rebased changeset. The is dubious when, before the rebase, the working
    directory was not a parent of the tip most rebased changeset.
    
    With this changeset, we move the working directory back to its original parent.
    If the original parent was rebased, we use it's successors.
    
    This is a step toward solving issue3813 (rebase loses active bookmark if it's
    not on a head)