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

[Antoine Pitrou]

On Fri, 29 Jul 2011 14:35:24 +0200
eric.araujo <python-checkins at python.org> wrote:
> http://hg.python.org/cpython/rev/bdad5bc9a2ed
> changeset:   71562:bdad5bc9a2ed
> branch:      3.2
> user:        Éric Araujo <merwok at netwok.org>
> date:        Thu Jul 28 22:45:46 2011 +0200
> 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.

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

Regards

Antoine.