Dan Price <dp at eng.sun.com> writes: > On Mon 12 May 2008 at 05:55PM, Shawn Walker wrote: >> I'm curious as to how others here handle merges when changes happen. >> >> Meaning, I commit to my own hg repository locally, and pull >> periodically for updates. >> >> Once I finish the merge, do I commit, and then recommit to squish the deltas? >> >> What's the "right way" to keep up with changes? > > I may be overly paranoid, but I always do: > > commit > backup > pull > merge (if needed) > recommit (optionally) > > At the end I always recommit. Since I have trashed workspaces during > mergin before, I will occassionally also take a full backup or a zfs > snap of my workspace prior to the pull.
(I seem to ask this question a lot). Trash by user error or mis-merge, or via use of the onnv-scm tools? I, at least, would appreciate knowing about *anything* causing people problems in their use of mercurial (even if not related to onnv-scm), we're going to expose a whole bunch of people to this stuff, sooner rather than later, anything that indicates a problem is of importance. -- Rich
