Re: Mysterious unresolved conflicts

2022-12-08 Thread Dave S
On Thu, Dec 8, 2022 at 5:12 PM Dave S wrote: > I've been a bad boy, using backups to track changes on a personal > project. I've finally sat down and have been making proper check-ins. > I've had a couple merges in this process, and with a couple of manual > resolves, all seemed well. > > As I

Mysterious unresolved conflicts

2022-12-08 Thread Dave S
I've been a bad boy, using backups to track changes on a personal project. I've finally sat down and have been making proper check-ins. I've had a couple merges in this process, and with a couple of manual resolves, all seemed well. As I near being caught up, I want to hg up to an earlier node.

emacs commit on every save

2022-12-08 Thread Uwe Brauer
Hi I used that functionality a long time ago, when I still used RCS, now inspired by git-auto-commit-mode I came up with the following quite simple solution, maybe some of your might find this useful Regards Uwe Brauer (defvar hg-mycommit "hg ci " "Variable to control which VC commit