I'd been wondering how I'd explain the pull/merge/recommit/pull/... cycle
to my team, and then the fetch discussion erupted on the mercurial list and
it seems this could be more of nuisance that I had been thinking it would be.
So, looking at fetch now, this cycle can become fetch/recommit/fetch/recomm..
in many cases. Keeping the use of fetch as simple as possible means that it
will put that "Automated merge with ..." comment in the merge cset. Here's a
patch for cdm.py to strip out that message.
Dean
Index: onbld/hgext/cdm.py
===================================================================
--- onbld.orig/hgext/cdm.py 2008-04-15 15:20:00.000000000 -0500
+++ onbld/hgext/cdm.py 2008-04-15 15:40:16.796538000 -0500
@@ -44,7 +44,7 @@ goodversion = "0.9.5"
# "using %s" % (goodversion, version.get_version()))
-import sys, os, pwd, ConfigParser
+import sys, os, pwd, ConfigParser, re
from fnmatch import fnmatch
from mercurial import cmdutil, changegroup, patch, node, commands
from cStringIO import StringIO
@@ -933,7 +933,14 @@ def cdm_recommit(ui, repo, **opts):
message = cmdutil.logmessage(opts)
if not message:
- message = ui.edit('\n'.join(active.comments()), ui.username())
+ # Strip any comment left by the 'hg fetch' command.
+ fetchre = re.compile(r'^Automated merge with ')
+ acomments = []
+ for l in active.comments():
+ if not fetchre.match(l):
+ acomments.append(l)
+ acomments.append('\n')
+ message = ui.edit('\n'.join(acomments), ui.username())
bk = CdmBackup(ui, os.path.split(repo.root)[1])
if bk.need_backup(wslist[repo]):
