Mercurial > hg

annotate hgext/largefiles/CONTRIBUTORS @ 18778:1ef89df2c248

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cfccd3bee7b3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
1 Greg Ward, author of the original bfiles extension
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
2 Na'Tosha Bard of Unity Technologies
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
3 Fog Creek Software
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
4 Special thanks to the University of Toronto and the UCOSP program