Skip to content
Snippets Groups Projects
  • Pierre-Yves David's avatar
    7159426c8d13
    rebase: properly handle unrebased revision between rebased one · 7159426c8d13
    Pierre-Yves David authored
    With rebase taking multiple roots it is possible to have revision in the "rebase
    domain" not rebased themself. We do not want rebased revision above them to be
    detached. We want such revision to be rebased on the nearest rebased ancestors.
    This allows to preserve the topology of the rebase set as much a possible
    
    To achieve this we introduce a new state `revignored` which informs
    `defineparents` of the situation.
    
    The test in `test-rebase-obsolete.t` was actually wrote and his now fixed.
    7159426c8d13
    History
    rebase: properly handle unrebased revision between rebased one
    Pierre-Yves David authored
    With rebase taking multiple roots it is possible to have revision in the "rebase
    domain" not rebased themself. We do not want rebased revision above them to be
    detached. We want such revision to be rebased on the nearest rebased ancestors.
    This allows to preserve the topology of the rebase set as much a possible
    
    To achieve this we introduce a new state `revignored` which informs
    `defineparents` of the situation.
    
    The test in `test-rebase-obsolete.t` was actually wrote and his now fixed.