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

[R. David Murray]

On Fri, 29 Jul 2011 15:38:31 +0200, Antoine Pitrou <solipsis at pitrou.net> wrote:
> On Fri, 29 Jul 2011 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