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

[Éric Araujo]

Le 29/07/2011 14:50, Antoine Pitrou a écrit :
>> changeset:   71562:bdad5bc9a2ed
>> user:        Éric Araujo <merwok at netwok.org>
>> summary:
>>   Stop ignoring Mercurial merge conflits files (#12255).
>>
>> R. David Murray and I think that it’s more useful to have these files
>> show up in the output of “hg status”, to let the user know that some
>> merged file have to be checked before commit.
> 
> Mercurial will prevent you from committing before you have solved
> conflicts, so I'm not sure what this brings. "hg res -l" is the command
> to remember when you want to list files with conflicts.

People confused by the merge/resolve system could exit their merge tool
without actually merging the changes (I know it happened to me!), so
these files act as a reminder that not everything is right.

.orig is also created by hg revert; my usage is that I remove this file
after I’ve checked that the revert is okay.

> The fact that "make clean" doesn't wipe these files is an additional
> annoyance.

make clean removes generated files, but *.rej and *.orig are backups,
which you may want to save or re-apply.  I’m not sure it would be right
to lose them.  Maybe distclean?

Regards