Skip to content
Snippets Groups Projects
  • Patrick Mézard's avatar
    b9f51f49bf2a
    rebase: preserve mq series order, guarded patches (issue2849) · b9f51f49bf2a
    Patrick Mézard authored
    The previous code was rebasing an applied series like:
    
      patch1 +guarded
      patch2
      patch3 +guarded
      patch4
      patch5 +guarded
    
    into:
    
      patch2
      patch4
      patch1 +guarded
      patch3 +guarded
      patch5 +guarded
    
    Reported by Lars Westerhoff <lars.westerhoff@newtec.eu>
    
    Also rename mq.series_dirty into mq.seriesdirty, missed by 599a72895c0d, and
    without effect since mq.qimport() was setting it already.
    b9f51f49bf2a
    History
    rebase: preserve mq series order, guarded patches (issue2849)
    Patrick Mézard authored
    The previous code was rebasing an applied series like:
    
      patch1 +guarded
      patch2
      patch3 +guarded
      patch4
      patch5 +guarded
    
    into:
    
      patch2
      patch4
      patch1 +guarded
      patch3 +guarded
      patch5 +guarded
    
    Reported by Lars Westerhoff <lars.westerhoff@newtec.eu>
    
    Also rename mq.series_dirty into mq.seriesdirty, missed by 599a72895c0d, and
    without effect since mq.qimport() was setting it already.