A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://mail.python.org/pipermail/python-dev/2011-July/112635.html below:

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

[Python-Dev] cpython (3.2): Stop ignoring Mercurial merge conflits files (#12255). [Python-Dev] cpython (3.2): Stop ignoring Mercurial merge conflits files (#12255).Antoine Pitrou solipsis at pitrou.net
Fri Jul 29 16:49:35 CEST 2011
On Fri, 29 Jul 2011 16:21:42 +0200
Éric Araujo <merwok at netwok.org> wrote:
> > What use are these backups really? We are using a (D)VCS, you are not
> > losing anything.
> 
> The .orig files after a revert could contain code that’s not committed
> anywhere.  See also RDM’s reply to your message.

I would point out that by using "hg revert", you deliberately want to
forget some local changes.

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.

Regards

Antoine.


More information about the Python-Dev mailing list

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4