Skip to content
  • Anton Shestakov's avatar
    rewind: make sure merge commits include files from p1 and p2 · 7839720c7c75
    Anton Shestakov authored
    Otherwise rewinding a merge commit makes it lose all changes.
    
    This fix populates `updates` argument of rewriteutil.rewrite() with parent
    changesets. That argument is normally used for folding multiple changesets, but
    in this case it's simply used to include files from p1 and p2. Usually,
    rewrite() works fine using ctx.files(), but that function can return an empty
    list when ctx is a merge commit.
    7839720c7c75
To find the state of this project's repository at the time of any of these versions, check out the tags.