Mercurial > hg
diff hgext/largefiles/overrides.py @ 18778:1ef89df2c248
rebase: fix --collapse when a file was added then removed
When a series of commits first adds a file and then removes it,
hg rebase --collapse prompts whether to keep the file or delete it. This is
due to it reusing the branch merge code. In a noninteractive terminal it
defaults to keeping the file, which results in a collapsed commit that is
has a file that should be deleted. This bug resulted in developers accidentally
commiting unintentional changes to our repo twice today, so it's fairly
important to get fixed.
This change allows rebase --collapse to tell the merge code to accept the
latest version every time without prompting.
Adds a test as well.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 15 Mar 2013 11:23:29 -0700 |
parents | 1793251e75c8 |
children | a12798938721 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sun Mar 17 23:27:14 2013 -0500 +++ b/hgext/largefiles/overrides.py Fri Mar 15 11:23:29 2013 -0700 @@ -361,9 +361,10 @@ # writing the files into the working copy and lfcommands.updatelfiles # will update the largefiles. def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force, - partial): + partial, acceptremote=False): overwrite = force and not branchmerge - actions = origfn(repo, p1, p2, pa, branchmerge, force, partial) + actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, + acceptremote) processed = [] for action in actions: