[Python-Dev] cpython (3.2): Stop ignoring Mercurial merge conflits files (#12255).

Fri Jul 29 16:50:57 CEST 2011

On 2011年7月29日 15:38:31 +0200, Antoine Pitrou <solipsis at pitrou.net> wrote:
> On 2011年7月29日 15:28:44 +0200 > Ã‰ric Araujo <merwok at netwok.org> wrote:
> > make clean removes generated files, but *.rej and *.orig are backups,
> > which you may want to save or re-apply.
>> What use are these backups really? We are using a (D)VCS, you are not
> losing anything.

As Ã‰ric said, the .orig files may contain uncommitted changes. The
.rej files are information about what parts of the patch were
*not* applied, which is information that is not retained
anywhere else.
--David