Faster mercurial patch queue merging with emacs

As a follow-up to my previous post about merging mq reject in emacs, I thought I’d share some improvements to the process that I’ve made since then. (defun switch-hg-reject ()   (interactive)   (let ((other-file      (if (string= (substring (buffer-file-name) -4 nil) ".rej")          (substring (buffer-file-name) 0 -4)       […]

Dealing with mercurial patch queue rejects in emacs

Since Mozilla has embraced mercurial, and especially patch queues, with open arms, I get to deal with rebasing patches frequently. There are two ways this can happen – either you set up an external merge tool like meld to handle each conflict, or the rejected changes are dumped in a filename.ext.rej in the same directory […]