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

eric.araujo python-checkins at python.org
Fri Jul 29 14:35:24 CEST 2011


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.  If you want to ignore
these files in your clones, it’s possible to do so from another ignore
file; see the bug report for directions.

I’m leaving the .gitignore file alone, as I don’t know how git users
work with merges and conflicts.

files:
  .hgignore |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -46,8 +46,6 @@
 *.pyo
 *.pyd
 *.cover
-*.orig
-*.rej
 *~
 Lib/lib2to3/*.pickle
 Lib/test/data/*

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list