Skip to content
Snippets Groups Projects
  • kiilerix's avatar
    7d28d6a67dd3
    rebase: write series file without removed mq patches · 7d28d6a67dd3
    kiilerix authored
    Rebase will remove empty changesets and will also completely remove the mq
    patch file for rebased empty patches.
    
    Starting with b28004513977 (1.9) it would preserve guards by writing the old
    series file back. That would however also reintroduce removed patch files in
    the series file and the inconsistency would make qpop + qpush fail.
    
    This patch backs out most of b28004513977 and makes sure guards are preserved
    without reintroducing removed patches.
    7d28d6a67dd3
    History
    rebase: write series file without removed mq patches
    kiilerix authored
    Rebase will remove empty changesets and will also completely remove the mq
    patch file for rebased empty patches.
    
    Starting with b28004513977 (1.9) it would preserve guards by writing the old
    series file back. That would however also reintroduce removed patch files in
    the series file and the inconsistency would make qpop + qpush fail.
    
    This patch backs out most of b28004513977 and makes sure guards are preserved
    without reintroducing removed patches.