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

Sat Jul 30 04:22:05 CEST 2011

On 2011年7月29日 23:36:03 +0200, Antoine Pitrou <solipsis at pitrou.net> wrote:
> On 2011年7月29日 12:19:45 -0400
> "R. David Murray" <rdmurray at bitdance.com> wrote:
> > 
> > > Besides, "hg status" is meant to show untracked files which could
> > > *potentially* be tracked. It's not like anybody wants to track .orig
> > > and .rej files, so having them in the ignore list is still the right
> > > thing to do.
> > 
> > That's one view. My view is that 'hg status' tells me all the files
> > that have appeared in my tree that I'm either not currently tracking or
> > explicitly ignoring (because the project's automated tools will deal
> > with them). Nothing in there about limiting it to files I *might*
> > want to track. That is how I've always used my version control
> > systems.
>> Ok, I understand. However, it also makes things more tedious for other
> people who don't user their VCS in such a way, so it would be nice how
> other people feel about this.

They can add those files to their personal .hgrc. I can't *remove*
those ignores via mine.
--
R. David Murray http://www.bitdance.com