On Fri, 29 Jul 2011 15:28:44 +0200 Éric Araujo <mer...@netwok.org> wrote: > Le 29/07/2011 14:50, Antoine Pitrou a écrit : > >> changeset: 71562:bdad5bc9a2ed > >> user: Éric Araujo <mer...@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.
I don't know, I don't use a merge tool. But presumably the merge tool would only call "hg resolve -m" on those files which have actually been resolved? (if it calls that command at all) > > 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. What use are these backups really? We are using a (D)VCS, you are not losing anything. Regards Antoine. _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
