[Python-Dev] Hg tips (original) (raw)

Georg Brandl g.brandl at gmx.net
Thu Sep 29 18:21:53 CEST 2011

Am 29.09.2011 17:11, schrieb Barry Warsaw:

On Sep 29, 2011, at 12:07 PM, Victor Stinner wrote:

I disabled the merge GUI: I lose a lot of work because I'm unable to use a GUI to do merge, I don't understand what are the 3 versions of the same file (which one is the merged version!?) Emacs users should look at smerge-mode. It has some nice keybindings and colorizing that usually makes resolving conflicts fairly straightforward. It also will automatically $vcs resolve the file when you've handled all the conflicts. Caveat: I use it primarily for bzr, but I think it works with most vcs's.

Yes, this is what I do as well for hg. (I had to write the "hg resolve -m" support myself, but that was a year or two ago. I assume it's out-of-the-box now.)

Georg

More information about the Python-Dev mailing list