21029166 mercurial 3.4 s11-update
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 06 May 2015 10:05:59 -0700
branchs11-update
changeset 4321 38b0ccd2f460
parent 4318 7f2f7aebce6e
child 4326 967c8138ab7b
21029166 mercurial 3.4
components/mercurial/Makefile
components/mercurial/mercurial-GENFRAG.p5m
components/mercurial/mercurial-PYVER.p5m
components/mercurial/patches/hgk.patch
components/mercurial/patches/issue4646.patch
components/mercurial/patches/manpages.patch
components/mercurial/patches/rst.patch
--- a/components/mercurial/Makefile	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/Makefile	Wed May 06 10:05:59 2015 -0700
@@ -28,16 +28,16 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	3.2.3
+COMPONENT_VERSION=	3.4
 COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c4369320e276d78aada1b5936e96c7bbbbb8154cfba725ef4e8757dcedeaf1ef
+    sha256:ff1da0545cdd46ebcf473176d55937a22bb55fff51cdff9d4c2f900fc80baf10
 COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
-TPNO=			21341
+TPNO=			22534
 
 # Mercurial does not yet support Python 3.
 PYTHON_VERSIONS = 2.7 2.6
--- a/components/mercurial/mercurial-GENFRAG.p5m	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Wed May 06 10:05:59 2015 -0700
@@ -52,11 +52,9 @@
 file path=usr/demo/mercurial/hgsh/hgsh.c
 file path=usr/demo/mercurial/hgweb.fcgi mode=555
 file path=usr/demo/mercurial/hgweb.wsgi
-file path=usr/demo/mercurial/lock-checker.py
 file path=usr/demo/mercurial/logo-droplets.svg
 file path=usr/demo/mercurial/memory.py
 file path=usr/demo/mercurial/mercurial.el
-file path=usr/demo/mercurial/mergetools.hgrc
 file path=usr/demo/mercurial/mq.el
 file path=usr/demo/mercurial/perf.py
 file path=usr/demo/mercurial/pylintrc
--- a/components/mercurial/mercurial-PYVER.p5m	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/mercurial-PYVER.p5m	Wed May 06 10:05:59 2015 -0700
@@ -48,6 +48,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/acl.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/bugzilla.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/censor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/color.py
@@ -132,8 +133,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/context.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/copies.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/crecord.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagparser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/default.d/mergetools.rc
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py
@@ -244,6 +247,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/merge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minirst.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mpatch.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/namespaces.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/node.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/obsolete.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/osutil.so
@@ -322,6 +326,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/summary.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/json/changelist.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/json/map
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.bisect
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.changelog
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.compact
--- a/components/mercurial/patches/hgk.patch	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/patches/hgk.patch	Wed May 06 10:05:59 2015 -0700
@@ -1,13 +1,15 @@
-# 6542518 hg view does not work
+Make the hgk extension find the GUI bits as installed on Solaris without
+making the user do any extra configuration.  Because this is patch is
+specific to Solaris, it's not appropriate for sending upstream, and because
+it's so simple, it's effectively a zero maintenance burden.
 
---- mercurial-2.2.1/hgext/hgk.py	Thu May  3 14:06:28 2012
-+++ mercurial-2.2.1/hgext/hgk.py	Sat May 12 17:31:15 2012
[email protected]@ -307,7 +307,7 @@
-     "start interactive history viewer"
-     os.chdir(repo.root)
-     optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
+--- mercurial-3.4/hgext/hgk.py.orig	Fri May  1 14:48:50 2015
++++ mercurial-3.4/hgext/hgk.py	Mon May  4 14:43:19 2015
[email protected]@ -326,6 +326,6 @@
+     if repo.filtername is None:
+         optstr += '--hidden'
+ 
 -    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
 +    cmd = ui.config("hgk", "path", "/usr/demo/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
      ui.debug("running %s\n" % cmd)
-     util.system(cmd)
- 
+     ui.system(cmd)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/issue4646.patch	Wed May 06 10:05:59 2015 -0700
@@ -0,0 +1,45 @@
+# HG changeset patch
+# User Gregory Szorc <[email protected]>
+# Date 1430931130 25200
+#      Wed May 06 09:52:10 2015 -0700
+# Branch stable
+# Node ID 44b054c3a46eac63d5fed06ffb8fffc38d5668f6
+# Parent  41cd8171e58f991373dcd0b4897dc1e5978d42dd
+extensions: clear aftercallbacks after execution (issue4646)
+
+It was reported that enabling pager without color could cause a hang.
+Inserting print statements revealed that the callbacks in
+extensions._aftercallbacks were being invoked twice.
+
+extensions.loadall can be called multiple times. If entries in
+extensions._aftercallbacks linger between calls, this could result
+in double execution of the callbacks. This can lead to unwanted
+behavior.
+
+The reproduce steps in the bug seem to only occur when the output of
+a command is less than the size of the current screen. This is not
+something that can easily be tested. I verified the test case works
+with this patch and that pager and color interaction continues to
+work. Since we have no existing automated tests for pager, this sadly
+appears to be the best testing I can do.
+
+diff --git a/mercurial/extensions.py b/mercurial/extensions.py
+--- a/mercurial/extensions.py
++++ b/mercurial/extensions.py
[email protected]@ -133,8 +133,12 @@ def loadall(ui):
+ 
+         for fn in _aftercallbacks[shortname]:
+             fn(loaded=False)
+ 
++    # loadall() is called multiple times and lingering _aftercallbacks
++    # entries could result in double execution. See issue4646.
++    _aftercallbacks.clear()
++
+ def afterloaded(extension, callback):
+     '''Run the specified function after a named extension is loaded.
+ 
+     If the named extension is already loaded, the callback will be called
+_______________________________________________
+Mercurial-devel mailing list
[email protected]
+http://selenic.com/mailman/listinfo/mercurial-devel
--- a/components/mercurial/patches/manpages.patch	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/patches/manpages.patch	Wed May 06 10:05:59 2015 -0700
@@ -1,5 +1,5 @@
---- mercurial-3.2.3/doc/hg.1.orig	Thu Dec 18 12:59:32 2014
-+++ mercurial-3.2.3/doc/hg.1	Thu Dec 18 18:23:28 2014
+--- mercurial-3.4/doc/hg.1.orig	Fri May  1 14:49:19 2015
++++ mercurial-3.4/doc/hg.1	Mon May  4 14:57:31 2015
 @@ -3,33 +3,6 @@
  .TH HG 1 "" "" "Mercurial Manual"
  .SH NAME
@@ -174,7 +174,7 @@
  .TP
  .BI \-s,  \-\-similarity \ <SIMILARITY>
  .
[email protected]@ -234,7 +207,7 @@
[email protected]@ -238,7 +211,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -183,7 +183,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS annotate
[email protected]@ -242,9 +215,9 @@
[email protected]@ -246,9 +219,9 @@
  show changeset information by line for each file:
  .sp
  .nf
@@ -195,7 +195,7 @@
  .fi
  .sp
  List changes in files, showing the revision id responsible for
[email protected]@ -261,7 +234,7 @@
[email protected]@ -265,7 +238,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -204,7 +204,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -273,7 +246,7 @@
[email protected]@ -277,7 +250,7 @@
  .TP
  .B \-\-no\-follow
  .
@@ -213,7 +213,7 @@
  .TP
  .B \-a,  \-\-text
  .
[email protected]@ -326,23 +299,23 @@
[email protected]@ -330,23 +303,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (DEPRECATED)
@@ -244,7 +244,7 @@
  .fi
  .sp
  By default, the revision used is the parent of the working
[email protected]@ -352,15 +325,15 @@
[email protected]@ -356,15 +329,15 @@
  extension (or override using \-t/\-\-type).
  .sp
  Examples:
@@ -263,7 +263,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -367,14 +340,14 @@
[email protected]@ -371,14 +344,14 @@
  create a tarball excluding .hg files:
  .sp
  .nf
@@ -282,7 +282,7 @@
  .TP
  .B \fBfiles\fP
  .sp
[email protected]@ -399,10 +372,10 @@
[email protected]@ -403,10 +376,10 @@
  .B \fBzip\fP
  .sp
  zip archive, compressed using deflate
@@ -295,7 +295,7 @@
  .sp
  Each member added to an archive file has a directory prefix
  prepended. Use \-p/\-\-prefix to specify a format string for the
[email protected]@ -412,7 +385,7 @@
[email protected]@ -416,7 +389,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -304,7 +304,7 @@
  .TP
  .B \-\-no\-decode
  .
[email protected]@ -441,7 +414,7 @@
[email protected]@ -445,7 +418,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -313,7 +313,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS backout
[email protected]@ -449,9 +422,9 @@
[email protected]@ -453,9 +426,9 @@
  reverse effect of earlier changeset:
  .sp
  .nf
@@ -325,7 +325,7 @@
  .fi
  .sp
  Prepare a new changeset with the effect of REV undone in the
[email protected]@ -472,17 +445,17 @@
[email protected]@ -476,17 +449,17 @@
  working directory and a new child of REV that simply undoes REV.
  .sp
  Before version 1.7, the behavior without \-\-merge was equivalent
@@ -346,7 +346,7 @@
  .TP
  .B \-\-merge
  .
[email protected]@ -527,7 +500,7 @@
[email protected]@ -535,7 +508,7 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -355,7 +355,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS bisect
[email protected]@ -535,9 +508,9 @@
[email protected]@ -543,9 +516,9 @@
  subdivision search of changesets:
  .sp
  .nf
@@ -367,7 +367,7 @@
  .fi
  .sp
  This command helps to find changesets which introduce problems. To
[email protected]@ -561,16 +534,16 @@
[email protected]@ -569,16 +542,16 @@
  is bad.
  .sp
  Some examples:
@@ -387,7 +387,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -578,10 +551,10 @@
[email protected]@ -586,10 +559,10 @@
  bad:
  .sp
  .nf
@@ -400,7 +400,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -589,10 +562,10 @@
[email protected]@ -597,10 +570,10 @@
  that revision is not usable because of another issue):
  .sp
  .nf
@@ -413,7 +413,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -599,9 +572,9 @@
[email protected]@ -607,9 +580,9 @@
  skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
  .sp
  .nf
@@ -426,7 +426,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -608,22 +581,22 @@
[email protected]@ -616,22 +589,22 @@
  forget the current bisection:
  .sp
  .nf
@@ -454,7 +454,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -631,9 +604,9 @@
[email protected]@ -639,9 +612,9 @@
  bisection:
  .sp
  .nf
@@ -466,7 +466,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -641,9 +614,9 @@
[email protected]@ -649,9 +622,9 @@
  if running with \-U/\-\-noupdate):
  .sp
  .nf
@@ -478,7 +478,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -650,9 +623,9 @@
[email protected]@ -658,9 +631,9 @@
  see all changesets that took part in the current bisection:
  .sp
  .nf
@@ -490,7 +490,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -659,18 +632,18 @@
[email protected]@ -667,18 +640,18 @@
  you can even get a nice graph:
  .sp
  .nf
@@ -514,7 +514,7 @@
  .TP
  .B \-r,  \-\-reset
  .
[email protected]@ -699,15 +672,15 @@
[email protected]@ -707,15 +680,15 @@
  .B \-U,  \-\-noupdate
  .
  do not update to target
@@ -533,7 +533,7 @@
  .fi
  .sp
  Bookmarks are labels on changesets to help track lines of development.
[email protected]@ -714,30 +687,30 @@
[email protected]@ -722,30 +695,30 @@
  Bookmarks are unversioned and can be moved, renamed and deleted.
  Deleting or moving a bookmark has no effect on the associated changesets.
  .sp
@@ -574,7 +574,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -744,9 +717,9 @@
[email protected]@ -752,9 +725,9 @@
  create an inactive bookmark as a place marker:
  .sp
  .nf
@@ -586,7 +586,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -753,23 +726,23 @@
[email protected]@ -761,23 +734,23 @@
  create an inactive bookmark on another changeset:
  .sp
  .nf
@@ -617,7 +617,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -796,20 +769,20 @@
[email protected]@ -804,20 +777,20 @@
  display with template (DEPRECATED)
  .sp
  aliases: bookmark
@@ -643,7 +643,7 @@
  information about named branches and bookmarks.
  .RE
  .sp
[email protected]@ -816,23 +789,23 @@
[email protected]@ -824,7 +797,7 @@
  With no argument, show the current branch name. With one argument,
  set the working directory branch name (the branch will not exist
  in the repository until the next commit). Standard practice
@@ -652,10 +652,7 @@
  branch.
  .sp
  Unless \-f/\-\-force is specified, branch will not let you set a
--branch name that already exists, even if it\(aqs inactive.
-+branch name that already exists, even if it's inactive.
- .sp
- Use \-C/\-\-clean to reset the working directory branch to that of
[email protected]@ -834,13 +807,13 @@
  the parent of the working directory, negating a previous branch
  change.
  .sp
@@ -672,7 +669,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -841,30 +814,30 @@
[email protected]@ -849,27 +822,27 @@
  .B \-C,  \-\-clean
  .
  reset branch name to parent branch name
@@ -696,9 +693,6 @@
 -been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:).
 +been marked closed (see \fBhg commit \-\-close\-branch\fP).
  .sp
- If \-a/\-\-active is specified, only show active branches. A branch
- is considered active if it contains repository heads.
- .sp
 -Use the command \%\fBhg update\fP\: to switch to an existing branch.
 +Use the command \fBhg update\fP to switch to an existing branch.
  .sp
@@ -710,7 +704,7 @@
  .TP
  .B \-a,  \-\-active
  .
[email protected]@ -877,15 +850,15 @@
[email protected]@ -882,15 +855,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (DEPRECATED)
@@ -729,7 +723,7 @@
  .fi
  .sp
  Generate a compressed changegroup file collecting changesets not
[email protected]@ -911,7 +884,7 @@
[email protected]@ -916,7 +889,7 @@
  Returns 0 on success, 1 if no changes found.
  .sp
  Options:
@@ -738,7 +732,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -948,7 +921,7 @@
[email protected]@ -953,7 +926,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -747,7 +741,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS cat
[email protected]@ -956,9 +929,9 @@
[email protected]@ -961,9 +934,9 @@
  output the current or given revision of files:
  .sp
  .nf
@@ -759,7 +753,7 @@
  .fi
  .sp
  Print the specified files as they were at the given revision. If
[email protected]@ -966,7 +939,7 @@
[email protected]@ -971,7 +944,7 @@
  .sp
  Output may be to a file, in which case the name of the file is
  given using a format string. The formatting rules as follows:
@@ -768,7 +762,7 @@
  .TP
  .B \fB%%\fP
  .sp
[email protected]@ -978,7 +951,7 @@
[email protected]@ -983,7 +956,7 @@
  .TP
  .B \fB%d\fP
  .sp
@@ -777,7 +771,7 @@
  .TP
  .B \fB%p\fP
  .sp
[email protected]@ -1003,12 +976,12 @@
[email protected]@ -1008,12 +981,12 @@
  .B \fB%b\fP
  .sp
  basename of the exporting repository
@@ -792,7 +786,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
[email protected]@ -1029,7 +1002,7 @@
[email protected]@ -1034,7 +1007,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -801,7 +795,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS clone
[email protected]@ -1037,9 +1010,9 @@
[email protected]@ -1042,9 +1015,9 @@
  make a copy of an existing repository:
  .sp
  .nf
@@ -813,7 +807,7 @@
  .fi
  .sp
  Create a copy of an existing repository in a new directory.
[email protected]@ -1047,22 +1020,22 @@
[email protected]@ -1052,22 +1025,22 @@
  If no destination directory name is specified, it defaults to the
  basename of the source.
  .sp
@@ -841,7 +835,7 @@
  revision will be checked out in the new repository by default.
  .sp
  To check out a particular version, use \-u/\-\-update, or
[email protected]@ -1079,9 +1052,9 @@
[email protected]@ -1084,9 +1057,9 @@
  directory using full hardlinks with
  .sp
  .nf
@@ -853,7 +847,7 @@
  .fi
  .sp
  This is the fastest way to clone, but it is not always safe. The
[email protected]@ -1093,7 +1066,7 @@
[email protected]@ -1098,7 +1071,7 @@
  .sp
  Mercurial will update the working directory to the first applicable
  revision from this list:
@@ -862,7 +856,7 @@
  .IP a. 3
  .
  null if \-U or the source repository has no changesets
[email protected]@ -1100,7 +1073,7 @@
[email protected]@ -1105,7 +1078,7 @@
  .IP b. 3
  .
  if \-u . and the source repository is local, the first parent of
@@ -871,7 +865,7 @@
  .IP c. 3
  .
  the changeset specified with \-u (if a branch name, this means the
[email protected]@ -1116,7 +1089,7 @@
[email protected]@ -1121,7 +1094,7 @@
  the tipmost head specified with the url#branch source syntax
  .IP g. 3
  .
@@ -880,7 +874,7 @@
  .IP h. 3
  .
  the tipmost head of the default branch
[email protected]@ -1123,18 +1096,18 @@
[email protected]@ -1128,18 +1101,18 @@
  .IP i. 3
  .
  tip
@@ -903,7 +897,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1141,9 +1114,9 @@
[email protected]@ -1146,9 +1119,9 @@
  create a lightweight local clone:
  .sp
  .nf
@@ -915,7 +909,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1150,9 +1123,9 @@
[email protected]@ -1155,9 +1128,9 @@
  clone from an absolute path on an ssh server (note double\-slash):
  .sp
  .nf
@@ -927,7 +921,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1160,9 +1133,9 @@
[email protected]@ -1165,9 +1138,9 @@
  specified version:
  .sp
  .nf
@@ -939,7 +933,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1169,9 +1142,9 @@
[email protected]@ -1174,9 +1147,9 @@
  create a repository without changesets after a particular revision:
  .sp
  .nf
@@ -951,7 +945,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1178,18 +1151,18 @@
[email protected]@ -1183,18 +1156,18 @@
  clone (and track) a particular named branch:
  .sp
  .nf
@@ -975,7 +969,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
[email protected]@ -1226,7 +1199,7 @@
[email protected]@ -1231,7 +1204,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -984,7 +978,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS commit
[email protected]@ -1234,16 +1207,16 @@
[email protected]@ -1239,16 +1212,16 @@
  commit the specified files or all outstanding changes:
  .sp
  .nf
@@ -1005,7 +999,7 @@
  will be committed.
  .sp
  If you are committing the result of a merge, do not provide any
[email protected]@ -1252,28 +1225,28 @@
[email protected]@ -1257,28 +1230,28 @@
  If no commit message is specified, Mercurial starts your
  configured editor where you can enter a message. In case your
  commit fails, you will find a backup of your message in
@@ -1041,7 +1035,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -1322,23 +1295,23 @@
[email protected]@ -1331,23 +1304,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1072,7 +1066,7 @@
  .fi
  .sp
  With no arguments, print names and values of all config items.
[email protected]@ -1356,12 +1329,12 @@
[email protected]@ -1365,12 +1338,12 @@
  With \-\-debug, the source (filename and line number) is printed
  for each config item.
  .sp
@@ -1087,7 +1081,7 @@
  .TP
  .B \-u,  \-\-untrusted
  .
[email protected]@ -1380,15 +1353,15 @@
[email protected]@ -1389,15 +1362,15 @@
  edit global config
  .sp
  aliases: showconfig debugconfig
@@ -1106,7 +1100,7 @@
  .fi
  .sp
  Mark dest as having copies of source files. If dest is a
[email protected]@ -1400,12 +1373,12 @@
[email protected]@ -1409,12 +1382,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect with the next commit. To undo a copy
@@ -1121,7 +1115,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -1426,23 +1399,23 @@
[email protected]@ -1435,23 +1408,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1152,7 +1146,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files.
[email protected]@ -1451,7 +1424,7 @@
[email protected]@ -1460,7 +1433,7 @@
  .IP Note
  .
  diff may generate unexpected results for merges, as it will
@@ -1161,7 +1155,7 @@
  parent changeset if no revisions are specified.
  .RE
  .sp
[email protected]@ -1469,18 +1442,18 @@
[email protected]@ -1478,18 +1451,18 @@
  anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1184,7 +1178,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1487,9 +1460,9 @@
[email protected]@ -1496,9 +1469,9 @@
  compare two historical versions of a directory, with rename info:
  .sp
  .nf
@@ -1196,7 +1190,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1496,9 +1469,9 @@
[email protected]@ -1505,9 +1478,9 @@
  get change stats relative to the last change on some date:
  .sp
  .nf
@@ -1209,7 +1203,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1505,9 +1478,9 @@
[email protected]@ -1514,9 +1487,9 @@
  diff all newly\-added files that contain a keyword:
  .sp
  .nf
@@ -1221,7 +1215,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1514,18 +1487,18 @@
[email protected]@ -1523,18 +1496,18 @@
  compare a revision and its parents:
  .sp
  .nf
@@ -1244,7 +1238,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -1586,7 +1559,7 @@
[email protected]@ -1603,7 +1576,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1253,7 +1247,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS export
[email protected]@ -1594,9 +1567,9 @@
[email protected]@ -1611,9 +1584,9 @@
  dump the header and diffs for one or more changesets:
  .sp
  .nf
@@ -1265,7 +1259,7 @@
  .fi
  .sp
  Print the changeset header and diffs for one or more revisions.
[email protected]@ -1614,7 +1587,7 @@
[email protected]@ -1631,7 +1604,7 @@
  .sp
  Output may be to a file, in which case the name of the file is
  given using a format string. The formatting rules are as follows:
@@ -1274,7 +1268,7 @@
  .TP
  .B \fB%%\fP
  .sp
[email protected]@ -1651,7 +1624,7 @@
[email protected]@ -1668,7 +1641,7 @@
  .B \fB%r\fP
  .sp
  zero\-padded changeset revision number
@@ -1283,7 +1277,7 @@
  .sp
  Without the \-a/\-\-text option, export will avoid generating diffs
  of files it detects as binary. With \-a, export will generate a
[email protected]@ -1658,13 +1631,13 @@
[email protected]@ -1675,13 +1648,13 @@
  diff anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1299,7 +1293,7 @@
  .IP \(bu 2
  .
  use export and import to transplant a bugfix to the current
[email protected]@ -1671,9 +1644,9 @@
[email protected]@ -1688,9 +1661,9 @@
  branch:
  .sp
  .nf
@@ -1311,7 +1305,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1681,9 +1654,9 @@
[email protected]@ -1698,9 +1671,9 @@
  rename information:
  .sp
  .nf
@@ -1323,7 +1317,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1691,16 +1664,16 @@
[email protected]@ -1708,16 +1681,16 @@
  descriptive names:
  .sp
  .nf
@@ -1344,7 +1338,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
[email protected]@ -1725,7 +1698,7 @@
[email protected]@ -1742,7 +1715,7 @@
  .B \-\-nodates
  .
  omit dates from diff headers
@@ -1353,7 +1347,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS files
[email protected]@ -1733,9 +1706,9 @@
[email protected]@ -1750,9 +1723,9 @@
  list tracked files:
  .sp
  .nf
@@ -1365,8 +1359,8 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory or
[email protected]@ -1746,15 +1719,15 @@
- of all files under Mercurial control in the working copy.
[email protected]@ -1763,15 +1736,15 @@
+ of all files under Mercurial control in the working directory.
  .sp
  Examples:
 -.INDENT 0.0
@@ -1384,7 +1378,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1761,9 +1734,9 @@
[email protected]@ -1778,9 +1751,9 @@
  shows sizes and flags for current revision:
  .sp
  .nf
@@ -1396,7 +1390,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1770,9 +1743,9 @@
[email protected]@ -1787,9 +1760,9 @@
  list all files named README:
  .sp
  .nf
@@ -1408,7 +1402,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1779,9 +1752,9 @@
[email protected]@ -1796,9 +1769,9 @@
  list all binary files:
  .sp
  .nf
@@ -1420,7 +1414,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1788,9 +1761,9 @@
[email protected]@ -1805,9 +1778,9 @@
  find files containing a regular expression:
  .sp
  .nf
@@ -1433,7 +1427,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1797,19 +1770,19 @@
[email protected]@ -1814,19 +1787,19 @@
  search tracked file contents with xargs and grep:
  .sp
  .nf
@@ -1458,16 +1452,16 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -1830,7 +1803,7 @@
- .BI \-T,  \-\-template \ <TEMPLATE>
- .
- display with template (DEPRECATED)
[email protected]@ -1851,7 +1824,7 @@
+ .B \-S,  \-\-subrepos
+ .
+ recurse into subrepositories
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS forget
[email protected]@ -1838,9 +1811,9 @@
[email protected]@ -1859,9 +1832,9 @@
  forget the specified files on the next commit:
  .sp
  .nf
@@ -1479,7 +1473,7 @@
  .fi
  .sp
  Mark the specified files so they will no longer be tracked
[email protected]@ -1850,18 +1823,18 @@
[email protected]@ -1871,18 +1844,18 @@
  entire project history, and it does not delete them from the
  working directory.
  .sp
@@ -1502,7 +1496,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1868,16 +1841,16 @@
[email protected]@ -1889,16 +1862,16 @@
  forget files that would be excluded by .hgignore:
  .sp
  .nf
@@ -1523,7 +1517,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -1886,7 +1859,7 @@
[email protected]@ -1907,7 +1880,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1532,7 +1526,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS graft
[email protected]@ -1894,15 +1867,15 @@
[email protected]@ -1915,15 +1888,15 @@
  copy changes from other branches onto the current branch:
  .sp
  .nf
@@ -1553,7 +1547,7 @@
  description from the source changesets.
  .sp
  Changesets that are ancestors of the current revision, that have
[email protected]@ -1912,9 +1885,9 @@
[email protected]@ -1933,9 +1906,9 @@
  of the form:
  .sp
  .nf
@@ -1565,7 +1559,7 @@
  .fi
  .sp
  If \-\-force is specified, revisions will be grafted even if they
[email protected]@ -1932,16 +1905,16 @@
[email protected]@ -1953,16 +1926,16 @@
  .RE
  .sp
  Examples:
@@ -1585,7 +1579,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1948,9 +1921,9 @@
[email protected]@ -1969,9 +1942,9 @@
  graft a range of changesets with one exception, updating dates:
  .sp
  .nf
@@ -1597,7 +1591,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1957,9 +1930,9 @@
[email protected]@ -1978,9 +1951,9 @@
  continue a graft after resolving conflicts:
  .sp
  .nf
@@ -1609,7 +1603,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1966,19 +1939,19 @@
[email protected]@ -1987,19 +1960,19 @@
  show the source of a grafted changeset:
  .sp
  .nf
@@ -1634,7 +1628,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -2023,7 +1996,7 @@
[email protected]@ -2044,7 +2017,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1643,7 +1637,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS grep
[email protected]@ -2031,9 +2004,9 @@
[email protected]@ -2052,9 +2025,9 @@
  search for a pattern in specified files and revisions:
  .sp
  .nf
@@ -1655,7 +1649,7 @@
  .fi
  .sp
  Search revisions of files for a regular expression.
[email protected]@ -2052,7 +2025,7 @@
[email protected]@ -2073,7 +2046,7 @@
  Returns 0 if a match is found, 1 otherwise.
  .sp
  Options:
@@ -1664,7 +1658,7 @@
  .TP
  .B \-0,  \-\-print0
  .
[email protected]@ -2101,7 +2074,7 @@
[email protected]@ -2122,7 +2095,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1673,7 +1667,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS heads
[email protected]@ -2109,9 +2082,9 @@
[email protected]@ -2130,9 +2103,9 @@
  show branch heads:
  .sp
  .nf
@@ -1685,7 +1679,7 @@
  .fi
  .sp
  With no arguments, show all open branch heads in the repository.
[email protected]@ -2121,11 +2094,11 @@
[email protected]@ -2142,11 +2115,11 @@
  .sp
  If one or more REVs are given, only open branch heads on the
  branches associated with the specified changesets are shown. This
@@ -1699,7 +1693,7 @@
  .sp
  If STARTREV is specified, only those heads that are descendants of
  STARTREV will be displayed.
[email protected]@ -2136,7 +2109,7 @@
[email protected]@ -2157,7 +2130,7 @@
  Returns 0 if matching heads are found, 1 if not.
  .sp
  Options:
@@ -1708,7 +1702,7 @@
  .TP
  .BI \-r,  \-\-rev \ <STARTREV>
  .
[email protected]@ -2161,15 +2134,15 @@
[email protected]@ -2182,15 +2155,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -1727,7 +1721,7 @@
  .fi
  .sp
  With no arguments, print a list of commands with short help messages.
[email protected]@ -2180,7 +2153,7 @@
[email protected]@ -2201,7 +2174,7 @@
  Returns 0 if successful.
  .sp
  Options:
@@ -1736,7 +1730,7 @@
  .TP
  .B \-e,  \-\-extension
  .
[email protected]@ -2193,15 +2166,15 @@
[email protected]@ -2214,15 +2187,15 @@
  .BI \-k,  \-\-keyword \ <VALUE>
  .
  show topics matching keyword
@@ -1744,7 +1738,7 @@
 +.RE
  .SS identify
  .sp
- identify the working copy or specified revision:
+ identify the working directory or specified revision:
  .sp
  .nf
 -.ft C
@@ -1755,7 +1749,7 @@
  .fi
  .sp
  Print a summary identifying the repository state at REV using one or
[email protected]@ -2216,15 +2189,15 @@
[email protected]@ -2237,15 +2210,15 @@
  cause lookup to operate on that repository/bundle.
  .sp
  Examples:
@@ -1774,7 +1768,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2231,9 +2204,9 @@
[email protected]@ -2252,9 +2225,9 @@
  find the revision corresponding to a tag:
  .sp
  .nf
@@ -1786,7 +1780,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2240,16 +2213,16 @@
[email protected]@ -2261,16 +2234,16 @@
  check the most recent revision of a remote repository:
  .sp
  .nf
@@ -1807,7 +1801,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2288,15 +2261,15 @@
[email protected]@ -2309,15 +2282,15 @@
  do not verify server certificate (ignoring web.cacerts config)
  .sp
  aliases: id
@@ -1826,7 +1820,7 @@
  .fi
  .sp
  Import a list of patches and commit them individually (unless
[email protected]@ -2312,7 +2285,7 @@
[email protected]@ -2333,7 +2306,7 @@
  text/plain body parts before first diff are added to commit
  message.
  .sp
@@ -1835,7 +1829,7 @@
  description from patch override values from message headers and
  body. Values given on command line with \-m/\-\-message and \-u/\-\-user
  override these.
[email protected]@ -2329,32 +2302,32 @@
[email protected]@ -2350,32 +2323,32 @@
  revision.
  .sp
  With \-s/\-\-similarity, hg will attempt to discover renames and
@@ -1875,7 +1869,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2361,9 +2334,9 @@
[email protected]@ -2382,9 +2355,9 @@
  import a changeset from an hgweb server:
  .sp
  .nf
@@ -1887,7 +1881,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2370,9 +2343,9 @@
[email protected]@ -2391,9 +2364,9 @@
  import all the patches in an Unix\-style mbox:
  .sp
  .nf
@@ -1899,7 +1893,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2380,16 +2353,16 @@
[email protected]@ -2401,16 +2374,16 @@
  possible):
  .sp
  .nf
@@ -1920,7 +1914,7 @@
  .TP
  .BI \-p,  \-\-strip \ <NUM>
  .
[email protected]@ -2409,7 +2382,7 @@
[email protected]@ -2430,7 +2403,7 @@
  .TP
  .B \-\-no\-commit
  .
@@ -1929,7 +1923,7 @@
  .TP
  .B \-\-bypass
  .
[email protected]@ -2448,15 +2421,15 @@
[email protected]@ -2473,15 +2446,15 @@
  guess renamed files by similarity (0<=s<=100)
  .sp
  aliases: patch
@@ -1948,8 +1942,38 @@
  .fi
  .sp
  Show new changesets found in the specified path/URL or the default
[email protected]@ -2469,15 +2442,15 @@
- See pull for valid source format details.
[email protected]@ -2495,17 +2468,17 @@
+ status is also displayed for each bookmark like below:
+ .sp
+ .nf
+-.ft C
++.ft
+ BM1               01234567890a added
+ BM2               1234567890ab advanced
+ BM3               234567890abc diverged
+ BM4               34567890abcd changed
+-.ft P
++.ft
+ .fi
+ .sp
+ The action taken locally when pulling depends on the
+ status of each bookmark:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBadded\fP
+ .sp
[email protected]@ -2522,7 +2495,7 @@
+ .B \fBchanged\fP
+ .sp
+ result depends on remote changesets
+-.UNINDENT
++.RE
+ .sp
+ From the point of view of pulling behavior, bookmark
+ existing only in the remote repository are treated as \fBadded\fP,
[email protected]@ -2532,15 +2505,15 @@
+ changesets twice if the incoming is followed by a pull.
  .sp
  Examples:
 -.INDENT 0.0
@@ -1967,7 +1991,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2484,10 +2457,10 @@
[email protected]@ -2547,10 +2520,10 @@
  show incoming changes excluding merges, store a bundle:
  .sp
  .nf
@@ -1980,7 +2004,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2494,16 +2467,16 @@
[email protected]@ -2557,16 +2530,16 @@
  briefly list changes inside a bundle:
  .sp
  .nf
@@ -2001,7 +2025,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -2576,23 +2549,23 @@
[email protected]@ -2639,23 +2612,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2032,7 +2056,7 @@
  .fi
  .sp
  Initialize a new repository in the given directory. If the given
[email protected]@ -2601,12 +2574,12 @@
[email protected]@ -2664,12 +2637,12 @@
  If no directory is given, the current directory is used.
  .sp
  It is possible to specify an \fBssh://\fP URL as the destination.
@@ -2047,7 +2071,7 @@
  .TP
  .BI \-e,  \-\-ssh \ <CMD>
  .
[email protected]@ -2619,15 +2592,15 @@
[email protected]@ -2682,15 +2655,15 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2066,7 +2090,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory whose
[email protected]@ -2645,12 +2618,12 @@
[email protected]@ -2708,12 +2681,12 @@
  will avoid the problem of "xargs" treating single filenames that
  contain whitespace as multiple filenames.
  .sp
@@ -2081,7 +2105,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2671,7 +2644,7 @@
[email protected]@ -2734,7 +2707,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2090,7 +2114,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS log
[email protected]@ -2679,9 +2652,9 @@
[email protected]@ -2742,9 +2715,9 @@
  show revision history of entire repository or files:
  .sp
  .nf
@@ -2102,7 +2126,7 @@
  .fi
  .sp
  Print the revision history of the specified files or the entire
[email protected]@ -2703,9 +2676,9 @@
[email protected]@ -2766,9 +2739,9 @@
  .sp
  With \-\-graph the revisions are shown as an ASCII art DAG with the most
  recent changeset at the top.
@@ -2115,7 +2139,7 @@
  .IP Note
  .
  log \-p/\-\-patch may generate unexpected diff output for merge
[email protected]@ -2721,15 +2694,15 @@
[email protected]@ -2784,15 +2757,15 @@
  .RE
  .sp
  Some examples:
@@ -2134,7 +2158,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2736,9 +2709,9 @@
[email protected]@ -2799,9 +2772,9 @@
  changesets ancestral to the working directory:
  .sp
  .nf
@@ -2146,7 +2170,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2745,9 +2718,9 @@
[email protected]@ -2808,9 +2781,9 @@
  last 10 commits on the current branch:
  .sp
  .nf
@@ -2158,7 +2182,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2754,9 +2727,9 @@
[email protected]@ -2817,9 +2790,9 @@
  changesets showing all modifications of a file, including removals:
  .sp
  .nf
@@ -2170,7 +2194,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2763,9 +2736,9 @@
[email protected]@ -2826,9 +2799,9 @@
  all changesets that touch a directory, with diffs, excluding merges:
  .sp
  .nf
@@ -2182,7 +2206,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2772,9 +2745,9 @@
[email protected]@ -2835,9 +2808,9 @@
  all revision numbers that match a keyword:
  .sp
  .nf
@@ -2194,7 +2218,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2781,9 +2754,9 @@
[email protected]@ -2844,9 +2817,9 @@
  list available log templates:
  .sp
  .nf
@@ -2206,7 +2230,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2790,9 +2763,9 @@
[email protected]@ -2853,9 +2826,9 @@
  check if a given changeset is included in a tagged release:
  .sp
  .nf
@@ -2218,7 +2242,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2799,9 +2772,9 @@
[email protected]@ -2862,9 +2835,9 @@
  find all changesets by some user in a date range:
  .sp
  .nf
@@ -2230,7 +2254,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2808,24 +2781,24 @@
[email protected]@ -2871,24 +2844,24 @@
  summary of all changesets after the last tag:
  .sp
  .nf
@@ -2262,7 +2286,7 @@
  .TP
  .B \-f,  \-\-follow
  .
[email protected]@ -2914,23 +2887,23 @@
[email protected]@ -2977,23 +2950,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2293,7 +2317,7 @@
  .fi
  .sp
  Print a list of version controlled files for the given revision.
[email protected]@ -2946,7 +2919,7 @@
[email protected]@ -3009,7 +2982,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2302,7 +2326,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2959,15 +2932,15 @@
[email protected]@ -3022,15 +2995,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (DEPRECATED)
@@ -2321,7 +2345,7 @@
  .fi
  .sp
  The current working directory is updated with all changes made in
[email protected]@ -2980,16 +2953,16 @@
[email protected]@ -3043,16 +3016,16 @@
  .sp
  \fB\-\-tool\fP can be used to specify the merge tool used for file
  merges. It overrides the HGMERGE environment variable and your
@@ -2342,7 +2366,7 @@
  will check out a clean copy of the original merge parent, losing
  all changes.
  .sp
[email protected]@ -2996,7 +2969,7 @@
[email protected]@ -3059,7 +3032,7 @@
  Returns 0 on success, 1 if there are unresolved files.
  .sp
  Options:
@@ -2351,7 +2375,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3013,15 +2986,15 @@
[email protected]@ -3076,15 +3049,15 @@
  .BI \-t,  \-\-tool \ <VALUE>
  .
  specify merge tool
@@ -2370,7 +2394,38 @@
  .fi
  .sp
  Show changesets not found in the specified destination repository
[email protected]@ -3033,7 +3006,7 @@
[email protected]@ -3098,18 +3071,18 @@
+ status is also displayed for each bookmark like below:
+ .sp
+ .nf
+-.ft C
++.ft
+ BM1               01234567890a added
+ BM2                            deleted
+ BM3               234567890abc advanced
+ BM4               34567890abcd diverged
+ BM5               4567890abcde changed
+-.ft P
++.ft
+ .fi
+ .sp
+ The action taken when pushing depends on the
+ status of each bookmark:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBadded\fP
+ .sp
[email protected]@ -3130,7 +3103,7 @@
+ .B \fBchanged\fP
+ .sp
+ push with \fB\-B\fP will update it
+-.UNINDENT
++.RE
+ .sp
+ From the point of view of pushing behavior, bookmarks
+ existing only in the remote repository are treated as
[email protected]@ -3139,7 +3112,7 @@
  Returns 0 if there are outgoing changes, 1 otherwise.
  .sp
  Options:
@@ -2379,7 +2434,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3102,37 +3075,37 @@
[email protected]@ -3208,37 +3181,37 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2427,7 +2482,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -3145,15 +3118,15 @@
[email protected]@ -3251,15 +3224,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -2446,7 +2501,7 @@
  .fi
  .sp
  Show definition of symbolic path name NAME. If no name is given,
[email protected]@ -3174,10 +3147,10 @@
[email protected]@ -3280,10 +3253,10 @@
  as the fallback for both.  When cloning a repository, the clone
  source is written as \fBdefault\fP in \fB.hg/hgrc\fP.  Note that
  \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
@@ -2460,7 +2515,7 @@
  .sp
  Returns 0 on success.
  .SS phase
[email protected]@ -3185,9 +3158,9 @@
[email protected]@ -3291,9 +3264,9 @@
  set or show the current phase name:
  .sp
  .nf
@@ -2472,7 +2527,7 @@
  .fi
  .sp
  With no argument, show the phase name of specified revisions.
[email protected]@ -3195,13 +3168,13 @@
[email protected]@ -3301,13 +3274,13 @@
  With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
  phase value of the specified revisions.
  .sp
@@ -2489,7 +2544,7 @@
  .fi
  .sp
  Returns 0 on success, 1 if no phases were changed or some could not
[email protected]@ -3208,7 +3181,7 @@
[email protected]@ -3314,7 +3287,7 @@
  be changed.
  .sp
  Options:
@@ -2498,7 +2553,7 @@
  .TP
  .B \-p,  \-\-public
  .
[email protected]@ -3229,7 +3202,7 @@
[email protected]@ -3335,7 +3308,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  target revision
@@ -2507,7 +2562,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS pull
[email protected]@ -3237,9 +3210,9 @@
[email protected]@ -3343,9 +3316,9 @@
  pull changes from the specified source:
  .sp
  .nf
@@ -2519,7 +2574,7 @@
  .fi
  .sp
  Pull changes from a remote repository to a local one.
[email protected]@ -3249,18 +3222,18 @@
[email protected]@ -3355,18 +3328,18 @@
  \-R is specified). By default, this does not update the copy of the
  project in the working directory.
  .sp
@@ -2544,7 +2599,7 @@
  .TP
  .B \-u,  \-\-update
  .
[email protected]@ -3293,7 +3266,7 @@
[email protected]@ -3399,7 +3372,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2553,7 +2608,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS push
[email protected]@ -3301,9 +3274,9 @@
[email protected]@ -3407,9 +3380,9 @@
  push changes to the specified destination:
  .sp
  .nf
@@ -2565,7 +2620,7 @@
  .fi
  .sp
  Push changesets from the local repository to the specified
[email protected]@ -3334,13 +3307,13 @@
[email protected]@ -3440,13 +3413,13 @@
  ancestors, and the bookmark will be pushed to the remote
  repository.
  .sp
@@ -2581,7 +2636,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3373,7 +3346,7 @@
[email protected]@ -3479,7 +3452,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2590,7 +2645,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS recover
[email protected]@ -3381,9 +3354,9 @@
[email protected]@ -3487,9 +3460,9 @@
  roll back an interrupted transaction:
  .sp
  .nf
@@ -2602,7 +2657,7 @@
  .fi
  .sp
  Recover from an interrupted commit or pull.
[email protected]@ -3398,16 +3371,16 @@
[email protected]@ -3504,16 +3477,16 @@
  remove the specified files on the next commit:
  .sp
  .nf
@@ -2623,7 +2678,7 @@
  .sp
  \-A/\-\-after can be used to remove only files that have already
  been deleted, \-f/\-\-force can be used to force deletion, and \-Af
[email protected]@ -3417,7 +3390,7 @@
[email protected]@ -3523,7 +3496,7 @@
  The following table details the behavior of remove for different
  file states (columns) and option combinations (rows). The file
  states are Added [A], Clean [C], Modified [M] and Missing [!]
@@ -2632,7 +2687,7 @@
  (from branch) and Delete (from disk):
  .TS
  center;
[email protected]@ -3491,7 +3464,7 @@
[email protected]@ -3597,7 +3570,7 @@
  Returns 0 on success, 1 if any warnings encountered.
  .sp
  Options:
@@ -2641,7 +2696,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -3508,23 +3481,23 @@
[email protected]@ -3618,23 +3591,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2672,7 +2727,7 @@
  .fi
  .sp
  Mark dest as copies of sources; mark sources for deletion. If dest
[email protected]@ -3536,12 +3509,12 @@
[email protected]@ -3646,12 +3619,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect at the next commit. To undo a rename
@@ -2687,7 +2742,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -3562,23 +3535,23 @@
[email protected]@ -3672,23 +3645,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -2718,7 +2773,7 @@
  .fi
  .sp
  Merges with unresolved conflicts are often the result of
[email protected]@ -3585,15 +3558,15 @@
[email protected]@ -3695,15 +3668,15 @@
  non\-interactive merging using the \fBinternal:merge\fP configuration
  setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
  command is used to manage the files involved in a merge, after
@@ -2739,7 +2794,7 @@
  files, discarding any previous merge attempts. Re\-merging is not
  performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
  to select all unresolved files. \fB\-\-tool\fP can be used to specify
[email protected]@ -3602,27 +3575,27 @@
[email protected]@ -3712,27 +3685,27 @@
  contents are saved with a \fB.orig\fP suffix.
  .IP \(bu 2
  .
@@ -2773,16 +2828,16 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -3655,7 +3628,7 @@
- .BI \-X,  \-\-exclude \ <PATTERN[+]>
- .
- exclude names matching the given patterns
[email protected]@ -3769,7 +3742,7 @@
+ .BI \-T,  \-\-template \ <TEMPLATE>
+ .
+ display with template (DEPRECATED)
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS revert
[email protected]@ -3663,15 +3636,15 @@
[email protected]@ -3777,15 +3750,15 @@
  restore files to their checkout state:
  .sp
  .nf
@@ -2802,7 +2857,7 @@
  .RE
  .sp
  With no revision specified, revert the specified files or directories
[email protected]@ -3685,18 +3658,18 @@
[email protected]@ -3799,18 +3772,18 @@
  directories to their states as of a specific revision. Because
  revert does not change the working directory parents, this will
  cause these files to appear modified. This can be helpful to "back
@@ -2824,7 +2879,7 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -3725,7 +3698,7 @@
[email protected]@ -3843,7 +3816,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -2833,7 +2888,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS rollback
[email protected]@ -3733,12 +3706,12 @@
[email protected]@ -3851,12 +3824,12 @@
  roll back the last transaction (DANGEROUS) (DEPRECATED):
  .sp
  .nf
@@ -2849,7 +2904,7 @@
  mistakes in the last commit.
  .sp
  This command should be used with care. There is only one level of
[email protected]@ -3753,7 +3726,7 @@
[email protected]@ -3871,7 +3844,7 @@
  .sp
  For example, the following commands are transactional, and their
  effects can be rolled back:
@@ -2858,7 +2913,7 @@
  .IP \(bu 2
  .
  commit
[email protected]@ -3769,10 +3742,10 @@
[email protected]@ -3887,10 +3860,10 @@
  .IP \(bu 2
  .
  unbundle
@@ -2871,7 +2926,7 @@
  override this protection.
  .sp
  This command is not intended for use on public repositories. Once
[email protected]@ -3785,7 +3758,7 @@
[email protected]@ -3903,7 +3876,7 @@
  Returns 0 on success, 1 if no rollback data is available.
  .sp
  Options:
@@ -2880,7 +2935,7 @@
  .TP
  .B \-n,  \-\-dry\-run
  .
[email protected]@ -3794,15 +3767,15 @@
[email protected]@ -3912,15 +3885,15 @@
  .B \-f,  \-\-force
  .
  ignore safety measures
@@ -2899,7 +2954,7 @@
  .fi
  .sp
  Print the root directory of the current repository.
[email protected]@ -3813,9 +3786,9 @@
[email protected]@ -3931,9 +3904,9 @@
  start stand\-alone webserver:
  .sp
  .nf
@@ -2911,7 +2966,7 @@
  .fi
  .sp
  Start a local HTTP repository browser and pull server. You can use
[email protected]@ -3840,7 +3813,7 @@
[email protected]@ -3958,7 +3931,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2920,7 +2975,7 @@
  .TP
  .BI \-A,  \-\-accesslog \ <FILE>
  .
[email protected]@ -3909,15 +3882,15 @@
[email protected]@ -4027,15 +4000,15 @@
  .BI \-\-certificate \ <FILE>
  .
  SSL certificate file
@@ -2939,7 +2994,7 @@
  .fi
  .sp
  Show status of files in the repository. If names are given, only
[email protected]@ -3945,7 +3918,7 @@
[email protected]@ -4063,7 +4036,7 @@
  The codes used to show the status of files are:
  .sp
  .nf
@@ -2948,7 +3003,7 @@
  M = modified
  A = added
  R = removed
[email protected]@ -3954,11 +3927,11 @@
[email protected]@ -4072,11 +4045,11 @@
  ? = not tracked
  I = ignored
    = origin of the previous file (with \-\-copies)
@@ -2962,7 +3017,7 @@
  .IP \(bu 2
  .
  show changes in the working directory relative to a
[email protected]@ -3965,9 +3938,9 @@
[email protected]@ -4083,19 +4056,19 @@
  changeset:
  .sp
  .nf
@@ -2974,7 +3029,20 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3974,9 +3947,9 @@
+ show changes in the working directory relative to the
+-current directory (see \%\fBhg help patterns\fP\: for more information):
++current directory (see \fBhg help patterns\fP for more information):
+ .sp
+ .nf
+-.ft C
++.ft
+ hg status re:
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -4102,9 +4075,9 @@
  show all changes including copies in an existing changeset:
  .sp
  .nf
@@ -2986,7 +3054,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3983,16 +3956,16 @@
[email protected]@ -4111,16 +4084,16 @@
  get a NUL separated list of added files, suitable for xargs:
  .sp
  .nf
@@ -3007,7 +3075,7 @@
  .TP
  .B \-A,  \-\-all
  .
[email protected]@ -4061,23 +4034,23 @@
[email protected]@ -4189,23 +4162,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (DEPRECATED)
@@ -3038,7 +3106,7 @@
  .fi
  .sp
  This generates a brief summary of the working directory state,
[email protected]@ -4089,7 +4062,7 @@
[email protected]@ -4217,7 +4190,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3047,7 +3115,7 @@
  .TP
  .B \-\-remote
  .
[email protected]@ -4096,15 +4069,15 @@
[email protected]@ -4224,15 +4197,15 @@
  check for push and pull
  .sp
  aliases: sum
@@ -3066,7 +3134,7 @@
  .fi
  .sp
  Name a particular revision using <name>.
[email protected]@ -4125,11 +4098,11 @@
[email protected]@ -4253,11 +4226,11 @@
  repositories).
  .sp
  Tag commits are usually made at the head of a branch. If the parent
@@ -3080,7 +3148,7 @@
  .sp
  Since tag names have priority over branch names during revision
  lookup, using an existing branch name as a tag name is discouraged.
[email protected]@ -4137,7 +4110,7 @@
[email protected]@ -4265,7 +4238,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3089,7 +3157,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -4170,15 +4143,15 @@
[email protected]@ -4298,15 +4271,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -3108,7 +3176,7 @@
  .fi
  .sp
  This lists both regular and local tags. When the \-v/\-\-verbose
[email protected]@ -4187,20 +4160,20 @@
[email protected]@ -4315,20 +4288,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3133,7 +3201,7 @@
  .fi
  .sp
  The tip revision (usually just called the tip) is the changeset
[email protected]@ -4212,12 +4185,12 @@
[email protected]@ -4340,12 +4313,12 @@
  that repository becomes the current tip. The "tip" tag is special
  and cannot be renamed or assigned to a different changeset.
  .sp
@@ -3148,7 +3216,7 @@
  .TP
  .B \-p,  \-\-patch
  .
[email protected]@ -4234,15 +4207,15 @@
[email protected]@ -4362,15 +4335,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -3167,7 +3235,7 @@
  .fi
  .sp
  Apply one or more compressed changegroup files generated by the
[email protected]@ -4251,32 +4224,32 @@
[email protected]@ -4379,32 +4352,32 @@
  Returns 0 on success, 1 if an update has unresolved files.
  .sp
  Options:
@@ -3210,7 +3278,7 @@
  option, the working directory is checked for uncommitted changes; if
  none are found, the working directory is updated to the specified
  changeset.
[email protected]@ -4283,12 +4256,12 @@
[email protected]@ -4411,12 +4384,12 @@
  .sp
  The following rules apply when the working directory contains
  uncommitted changes:
@@ -3225,7 +3293,7 @@
  are merged into the requested changeset and the merged
  result is left uncommitted. If the requested changeset is
  not an ancestor or descendant (that is, it is on another
[email protected]@ -4302,23 +4275,23 @@
[email protected]@ -4430,23 +4403,23 @@
  .
  With the \-C/\-\-clean option, uncommitted changes are discarded and
  the working directory is updated to the requested changeset.
@@ -3255,7 +3323,7 @@
  .TP
  .B \-C,  \-\-clean
  .
[email protected]@ -4341,25 +4314,25 @@
[email protected]@ -4469,25 +4442,25 @@
  specify merge tool
  .sp
  aliases: up checkout co
@@ -3286,7 +3354,7 @@
  for more information about recovery from corruption of the
  repository.
  .sp
[email protected]@ -4369,9 +4342,9 @@
[email protected]@ -4497,9 +4470,9 @@
  output version and copyright information:
  .sp
  .nf
@@ -3298,7 +3366,7 @@
  .fi
  .sp
  output version and copyright information
[email protected]@ -4378,7 +4351,7 @@
[email protected]@ -4506,7 +4479,7 @@
  .SH DATE FORMATS
  .sp
  Some commands allow the user to specify a date, e.g.:
@@ -3307,7 +3375,7 @@
  .IP \(bu 2
  .
  backout, commit, import, tag: Specify the commit date.
[email protected]@ -4385,10 +4358,10 @@
[email protected]@ -4513,10 +4486,10 @@
  .IP \(bu 2
  .
  log, revert, update: Select revision(s) by date.
@@ -3320,7 +3388,7 @@
  .IP \(bu 2
  .
  \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
[email protected]@ -4437,14 +4410,14 @@
[email protected]@ -4565,14 +4538,14 @@
  .IP \(bu 2
  .
  \fBnow\fP \- right now
@@ -3339,7 +3407,7 @@
  .sp
  This is the internal representation format for dates. The first number
  is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
[email protected]@ -4452,7 +4425,7 @@
[email protected]@ -4580,7 +4553,7 @@
  (negative if the timezone is east of UTC).
  .sp
  The log command also accepts date ranges:
@@ -3348,7 +3416,7 @@
  .IP \(bu 2
  .
  \fB<DATE\fP \- at or before a given date/time
[email protected]@ -4465,16 +4438,16 @@
[email protected]@ -4593,16 +4566,16 @@
  .IP \(bu 2
  .
  \fB\-DAYS\fP \- within a given number of days of today
@@ -3368,7 +3436,7 @@
  .IP \(bu 2
  .
  executable status and other permission bits
[email protected]@ -4487,7 +4460,7 @@
[email protected]@ -4615,7 +4588,7 @@
  .IP \(bu 2
  .
  creation or deletion of empty files
@@ -3377,7 +3445,7 @@
  .sp
  Mercurial also supports the extended diff format from the git VCS
  which addresses these limitations. The git diff format is not produced
[email protected]@ -4495,26 +4468,26 @@
[email protected]@ -4623,26 +4596,26 @@
  format.
  .sp
  This means that when generating diffs from a Mercurial repository
@@ -3411,7 +3479,7 @@
  Windows) is searched.
  .TP
  .B HGEDITOR
[email protected]@ -4532,9 +4505,9 @@
[email protected]@ -4660,9 +4633,9 @@
  .TP
  .B HGENCODINGMODE
  .
@@ -3423,7 +3491,7 @@
  settings include "replace", which replaces unknown characters, and
  "ignore", which drops them. This setting can be overridden with
  the \-\-encodingmode command\-line option.
[email protected]@ -4541,7 +4514,7 @@
[email protected]@ -4669,7 +4642,7 @@
  .TP
  .B HGENCODINGAMBIGUOUS
  .
@@ -3432,7 +3500,7 @@
  "ambiguous" widths like accented Latin characters with East Asian
  fonts. By default, Mercurial assumes ambiguous characters are
  narrow, set this variable to "wide" if such characters cause
[email protected]@ -4563,19 +4536,19 @@
[email protected]@ -4691,19 +4664,19 @@
  the .hg/hgrc from the current repository is read.
  .sp
  For each element in HGRCPATH:
@@ -3456,7 +3524,7 @@
  defaults, verbose mode, debug mode, quiet mode, tracebacks, and
  localization. This can be useful when scripting against Mercurial
  in the face of existing user configuration.
[email protected]@ -4596,7 +4569,7 @@
[email protected]@ -4724,7 +4697,7 @@
  .
  This is the string used as the author of a commit. If not set,
  available values will be considered in this order:
@@ -3465,7 +3533,7 @@
  .IP \(bu 2
  .
  HGUSER (deprecated)
[email protected]@ -4612,7 +4585,7 @@
[email protected]@ -4740,7 +4713,7 @@
  .IP \(bu 2
  .
  LOGNAME (with \[email protected]\fP appended)
@@ -3474,7 +3542,7 @@
  .sp
  (deprecated, use configuration file)
  .TP
[email protected]@ -4635,13 +4608,13 @@
[email protected]@ -4763,13 +4736,13 @@
  editor it uses is determined by looking at the environment
  variables HGEDITOR, VISUAL and EDITOR, in that order. The first
  non\-empty one is chosen. If all of them are empty, the editor
@@ -3490,7 +3558,7 @@
  .SH USING ADDITIONAL FEATURES
  .sp
  Mercurial has the ability to add new features through the use of
[email protected]@ -4654,22 +4627,22 @@
[email protected]@ -4782,22 +4755,22 @@
  like this:
  .sp
  .nf
@@ -3518,7 +3586,7 @@
  .sp
  Extensions are not loaded by default for a variety of reasons:
  they can increase startup overhead; they may be meant for advanced
[email protected]@ -4683,19 +4656,19 @@
[email protected]@ -4811,19 +4784,19 @@
  broader scope, prepend its path with !:
  .sp
  .nf
@@ -3543,7 +3611,7 @@
  .TP
  .B acl
  .
[email protected]@ -4824,9 +4797,9 @@
[email protected]@ -4956,9 +4929,9 @@
  .B zeroconf
  .
  discover and advertise repositories on the local network
@@ -3556,7 +3624,7 @@
  .SH SPECIFYING FILE SETS
  .sp
  Mercurial supports a functional language for selecting a set of
[email protected]@ -4833,7 +4806,7 @@
[email protected]@ -4965,7 +4938,7 @@
  files.
  .sp
  Like other file patterns, this pattern type is indicated by a prefix,
@@ -3565,7 +3633,7 @@
  by infix operators. Parenthesis can be used for grouping.
  .sp
  Identifiers such as filenames or patterns must be quoted with single
[email protected]@ -4844,18 +4817,18 @@
[email protected]@ -4976,18 +4949,18 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -3588,7 +3656,7 @@
  .TP
  .B \fBx and y\fP
  .sp
[email protected]@ -4869,10 +4842,10 @@
[email protected]@ -5001,10 +4974,10 @@
  .B \fBx \- y\fP
  .sp
  Files in x but not in y.
@@ -3601,7 +3669,16 @@
  .TP
  .B \fBadded()\fP
  .sp
[email protected]@ -4938,7 +4911,7 @@
[email protected]@ -5061,7 +5034,7 @@
+ .TP
+ .B \fBportable()\fP
+ .sp
+-File that has a portable name. (This doesn\(aqt include filenames with case
++File that has a portable name. (This doesn't include filenames with case
+ collisions.)
+ .TP
+ .B \fBremoved()\fP
[email protected]@ -5075,7 +5048,7 @@
  .B \fBsize(expression)\fP
  .sp
  File size matches the given expression. Examples:
@@ -3610,7 +3687,7 @@
  .IP \(bu 2
  .
  1k (files from 1024 to 2047 bytes)
[email protected]@ -4951,7 +4924,7 @@
[email protected]@ -5088,7 +5061,7 @@
  .IP \(bu 2
  .
  4k \- 1MB (files from 4096 bytes to 1048576 bytes)
@@ -3619,7 +3696,7 @@
  .TP
  .B \fBsubrepo([pattern])\fP
  .sp
[email protected]@ -4969,18 +4942,18 @@
[email protected]@ -5106,18 +5079,18 @@
  .B \fBunresolved()\fP
  .sp
  File that is marked unresolved according to the resolve state.
@@ -3642,7 +3719,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4987,9 +4960,9 @@
[email protected]@ -5124,9 +5097,9 @@
  Forget files that are in .hgignore but are already tracked:
  .sp
  .nf
@@ -3654,7 +3731,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4996,9 +4969,9 @@
[email protected]@ -5133,9 +5106,9 @@
  Find text files that contain a string:
  .sp
  .nf
@@ -3666,7 +3743,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5005,9 +4978,9 @@
[email protected]@ -5142,9 +5115,9 @@
  Find C files in a non\-standard encoding:
  .sp
  .nf
@@ -3679,7 +3756,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5014,9 +4987,9 @@
[email protected]@ -5151,9 +5124,9 @@
  Revert copies of large binary files:
  .sp
  .nf
@@ -3692,7 +3769,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5023,15 +4996,15 @@
[email protected]@ -5160,15 +5133,15 @@
  Remove files listed in foo.lst that contain the letter a or b:
  .sp
  .nf
@@ -3714,7 +3791,7 @@
  .TP
  .B Ancestor
  .
[email protected]@ -5039,7 +5012,7 @@
[email protected]@ -5176,7 +5149,7 @@
  changesets from a given changeset. More precisely, the ancestors
  of a changeset can be defined by two properties: a parent of a
  changeset is an ancestor, and a parent of an ancestor is an
@@ -3723,7 +3800,7 @@
  .TP
  .B Bookmark
  .
[email protected]@ -5046,7 +5019,7 @@
[email protected]@ -5183,7 +5156,7 @@
  Bookmarks are pointers to certain commits that move when
  committing. They are similar to tags in that it is possible to use
  bookmark names in all places where Mercurial expects a changeset
@@ -3732,7 +3809,7 @@
  when you make a commit.
  .sp
  Bookmarks can be renamed, copied and deleted. Bookmarks are local,
[email protected]@ -5058,9 +5031,9 @@
[email protected]@ -5195,9 +5168,9 @@
  .
  (Noun) A child changeset that has been created from a parent that
  is not a head. These are known as topological branches, see
@@ -3744,7 +3821,7 @@
  .sp
  Branches may be created when changes are pulled from or pushed to
  a remote repository, since new heads may be created by these
[email protected]@ -5075,7 +5048,7 @@
[email protected]@ -5212,7 +5185,7 @@
  (Verb) The action of creating a child changeset which results in
  its parent having more than one child.
  .sp
@@ -3753,7 +3830,7 @@
  .TP
  .B Branch, anonymous
  .
[email protected]@ -5094,19 +5067,19 @@
[email protected]@ -5231,19 +5204,19 @@
  .TP
  .B Branch head
  .
@@ -3778,7 +3855,7 @@
  .TP
  .B Branch, named
  .
[email protected]@ -5113,8 +5086,8 @@
[email protected]@ -5250,8 +5223,8 @@
  A collection of changesets which have the same branch name. By
  default, children of a changeset in a named branch belong to the
  same named branch. A child can be explicitly assigned to a
@@ -3789,7 +3866,7 @@
  branches.
  .sp
  Named branches can be thought of as a kind of namespace, dividing
[email protected]@ -5127,7 +5100,7 @@
[email protected]@ -5264,7 +5237,7 @@
  .TP
  .B Branch tip
  .
@@ -3798,7 +3875,7 @@
  .TP
  .B Branch, topological
  .
[email protected]@ -5177,24 +5150,24 @@
[email protected]@ -5314,24 +5287,24 @@
  revision. This use should probably be avoided where possible, as
  changeset is much more appropriate than checkout in this context.
  .sp
@@ -3829,7 +3906,7 @@
  .TP
  .B Clone
  .
[email protected]@ -5203,13 +5176,13 @@
[email protected]@ -5340,13 +5313,13 @@
  .sp
  Example: "Is your clone up to date?".
  .sp
@@ -3846,7 +3923,7 @@
  .TP
  .B Commit
  .
[email protected]@ -5234,7 +5207,7 @@
[email protected]@ -5371,7 +5344,7 @@
  system (DVCS) can be described as a directed acyclic graph (DAG),
  consisting of nodes and edges, where nodes correspond to
  changesets and edges imply a parent \-> child relation. This graph
@@ -3855,7 +3932,7 @@
  Mercurial, the DAG is limited by the requirement for children to
  have at most two parents.
  .TP
[email protected]@ -5244,7 +5217,7 @@
[email protected]@ -5381,7 +5354,7 @@
  .TP
  .B Default branch
  .
@@ -3864,7 +3941,7 @@
  .TP
  .B Descendant
  .
[email protected]@ -5252,7 +5225,7 @@
[email protected]@ -5389,7 +5362,7 @@
  from a given changeset. More precisely, the descendants of a
  changeset can be defined by two properties: the child of a
  changeset is a descendant, and the child of a descendant is a
@@ -3873,7 +3950,7 @@
  .TP
  .B Diff
  .
[email protected]@ -5277,7 +5250,7 @@
[email protected]@ -5414,7 +5387,7 @@
  Mercurial, that will be recorded in the next commit. The working
  directory initially corresponds to the snapshot at an existing
  changeset, known as the parent of the working directory. See
@@ -3882,7 +3959,7 @@
  to the files introduced manually or by a merge. The repository
  metadata exists in the .hg directory inside the working directory.
  .TP
[email protected]@ -5285,7 +5258,7 @@
[email protected]@ -5422,7 +5395,7 @@
  .
  Changesets in the draft phase have not been shared with publishing
  repositories and may thus be safely changed by history\-modifying
@@ -3891,7 +3968,7 @@
  .TP
  .B Experimental
  .
[email protected]@ -5293,13 +5266,13 @@
[email protected]@ -5430,13 +5403,13 @@
  .TP
  .B Graph
  .
@@ -3909,7 +3986,7 @@
  .sp
  Heads are where development generally takes place and are the
  usual targets for update and merge operations.
[email protected]@ -5311,9 +5284,9 @@
[email protected]@ -5448,9 +5421,9 @@
  .B Head, closed branch
  .
  A changeset that marks a head as no longer interesting. The closed
@@ -3921,7 +3998,7 @@
  .sp
  Closed heads can be re\-opened by committing new changeset as the
  child of the changeset that marks a head as closed.
[email protected]@ -5342,11 +5315,11 @@
[email protected]@ -5479,11 +5452,11 @@
  .TP
  .B Immutable history
  .
@@ -3935,7 +4012,7 @@
  .TP
  .B Manifest
  .
[email protected]@ -5363,7 +5336,7 @@
[email protected]@ -5500,7 +5473,7 @@
  .TP
  .B Named branch
  .
@@ -3944,7 +4021,7 @@
  .TP
  .B Null changeset
  .
[email protected]@ -5370,30 +5343,30 @@
[email protected]@ -5507,30 +5480,30 @@
  The empty changeset. It is the parent state of newly\-initialized
  repositories and repositories with no checked out revision. It is
  thus the parent of root changesets and the effective ancestor when
@@ -3983,7 +4060,7 @@
  .sp
  (Verb) The process of using a patch file to transform one
  changeset into another.
[email protected]@ -5403,13 +5376,13 @@
[email protected]@ -5540,13 +5513,13 @@
  .B Phase
  .
  A per\-changeset state tracking how the changeset has been or
@@ -4000,7 +4077,7 @@
  .TP
  .B Pull
  .
[email protected]@ -5417,7 +5390,7 @@
[email protected]@ -5554,7 +5527,7 @@
  not in the local repository are brought into the local
  repository. Note that this operation without special arguments
  only updates the repository, it does not update the files in the
@@ -4009,7 +4086,7 @@
  .TP
  .B Push
  .
[email protected]@ -5425,7 +5398,7 @@
[email protected]@ -5562,7 +5535,7 @@
  not in a remote repository are sent to the remote repository. Note
  that this operation only adds changesets which have been committed
  locally to the remote repository. Uncommitted changes are not
@@ -4018,7 +4095,7 @@
  .TP
  .B Repository
  .
[email protected]@ -5438,13 +5411,13 @@
[email protected]@ -5575,13 +5548,13 @@
  .TP
  .B Repository head
  .
@@ -4035,7 +4112,7 @@
  .TP
  .B Revision number
  .
[email protected]@ -5453,7 +5426,7 @@
[email protected]@ -5590,7 +5563,7 @@
  to a repository, starting with revision number 0. Note that the
  revision number may be different in each clone of a repository. To
  identify changesets uniquely between different clones, see
@@ -4044,7 +4121,7 @@
  .TP
  .B Revlog
  .
[email protected]@ -5464,7 +5437,7 @@
[email protected]@ -5601,7 +5574,7 @@
  .TP
  .B Rewriting history
  .
@@ -4053,7 +4130,7 @@
  .TP
  .B Root
  .
[email protected]@ -5474,13 +5447,13 @@
[email protected]@ -5611,13 +5584,13 @@
  .B Secret
  .
  Changesets in the secret phase may not be shared via push, pull,
@@ -4069,7 +4146,7 @@
  will thus automatically be shared with other using push and pull.
  .TP
  .B Tip
[email protected]@ -5492,7 +5465,7 @@
[email protected]@ -5629,7 +5602,7 @@
  .
  The head of a given branch with the highest revision number. When
  a branch name is used as a revision identifier, it refers to the
@@ -4078,7 +4155,7 @@
  numbers may be different in different repository clones, the
  branch tip may be different in different cloned repositories.
  .TP
[email protected]@ -5500,22 +5473,22 @@
[email protected]@ -5637,22 +5610,22 @@
  .
  (Noun) Another synonym of changeset.
  .sp
@@ -4106,7 +4183,7 @@
  .SH SYNTAX FOR MERCURIAL IGNORE FILES
  .SS Synopsis
  .sp
[email protected]@ -5542,16 +5515,16 @@
[email protected]@ -5679,16 +5652,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -4127,7 +4204,7 @@
  in .hgignore.
  .SS Syntax
  .sp
[email protected]@ -5566,13 +5539,13 @@
[email protected]@ -5703,13 +5676,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -4144,7 +4221,7 @@
  .TP
  .B \fBregexp\fP
  .sp
[email protected]@ -5581,7 +5554,7 @@
[email protected]@ -5718,7 +5691,7 @@
  .B \fBglob\fP
  .sp
  Shell\-style glob.
@@ -4153,7 +4230,7 @@
  .sp
  The chosen syntax stays in effect when parsing all patterns that
  follow, until another syntax is selected.
[email protected]@ -5593,7 +5566,7 @@
[email protected]@ -5730,7 +5703,7 @@
  .IP Note
  .
  Patterns specified in other than \fB.hgignore\fP are always rooted.
@@ -4162,7 +4239,7 @@
  .RE
  .SS Example
  .sp
[email protected]@ -5600,7 +5573,7 @@
[email protected]@ -5737,7 +5710,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -4171,7 +4248,7 @@
  # use glob syntax.
  syntax: glob
  
[email protected]@ -5611,21 +5584,21 @@
[email protected]@ -5748,21 +5721,21 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -4199,7 +4276,7 @@
  .IP \(bu 2
  .
  web
[email protected]@ -5635,11 +5608,11 @@
[email protected]@ -5772,11 +5745,11 @@
  .IP \(bu 2
  .
  collections
@@ -4215,7 +4292,7 @@
  .sp
  The \fBpaths\fP section maps URL paths to paths of repositories in the
  filesystem. hgweb will not expose the filesystem directly \- only
[email protected]@ -5654,7 +5627,7 @@
[email protected]@ -5791,7 +5764,7 @@
  path ends with \fB*\fP or \fB**\fP the filesystem will be searched
  recursively for repositories below that point.
  With \fB*\fP it will not recurse into the repositories it finds (except for
@@ -4224,7 +4301,7 @@
  With \fB**\fP it will also search inside repository working directories
  and possibly find subrepositories.
  .sp
[email protected]@ -5661,15 +5634,15 @@
[email protected]@ -5798,15 +5771,15 @@
  In this example:
  .sp
  .nf
@@ -4243,7 +4320,7 @@
  .IP \(bu 2
  .
  The first two entries make two repositories in different directories
[email protected]@ -5683,7 +5656,7 @@
[email protected]@ -5820,7 +5793,7 @@
  .
  The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
  and \fBhttp://server/user/bob/quux/testsubrepo/\fP
@@ -4252,7 +4329,43 @@
  .sp
  The \fBcollections\fP section is deprecated and has been superseded by
  \fBpaths\fP.
[email protected]@ -5696,8 +5669,8 @@
[email protected]@ -5843,7 +5816,7 @@
+ \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
+ .sp
+ Not all templates are available for all styles. Attempting to use
+-a style that doesn\(aqt have all templates defined may result in an error
++a style that doesn't have all templates defined may result in an error
+ rendering the page.
+ .sp
+ Many commands take a \fB{revision}\fP URL parameter. This defines the
[email protected]@ -5850,7 +5823,7 @@
+ changeset to operate on. This is commonly specified as the short,
+ 12 digit hexidecimal abbreviation for the full 40 character unique
+ revision identifier. However, any value described by
+-\%\fBhg help revisions\fP\: typically works.
++\fBhg help revisions\fP typically works.
+ .SS Commands and URLs
+ .sp
+ The following web commands and their URLs are available:
[email protected]@ -5904,7 +5877,7 @@
+ .sp
+ The argument for \fBrev\fP can be a single revision, a revision set,
+ or a literal keyword to search for in changeset data (equivalent to
+-\%\fBhg log \-k\fP\:).
++\fBhg log \-k\fP).
+ .sp
+ The \fBrevcount\fP query string argument defines the maximum numbers of
+ changesets to render.
[email protected]@ -5989,7 +5962,7 @@
+ .sp
+ Render help documentation.
+ .sp
+-This web command is roughly equivalent to \%\fBhg help\fP\:. If a \fBtopic\fP
++This web command is roughly equivalent to \fBhg help\fP. If a \fBtopic\fP
+ is defined, that help topic will be rendered. If not, an index of
+ available help topics will be rendered.
+ .sp
[email protected]@ -6060,8 +6033,8 @@
  ancestor of the two file versions, so they can determine the changes
  made on both branches.
  .sp
@@ -4263,7 +4376,7 @@
  .sp
  Usually, the merge tool tries to automatically reconcile the files by
  combining all non\-overlapping changes that occurred separately in
[email protected]@ -5722,7 +5695,7 @@
[email protected]@ -6086,7 +6059,7 @@
  .sp
  There are some internal merge tools which can be used. The internal
  merge tools are:
@@ -4272,7 +4385,7 @@
  .TP
  .B \fB:dump\fP
  .sp
[email protected]@ -5815,7 +5788,7 @@
[email protected]@ -6133,7 +6106,7 @@
  .B \fB:tagmerge\fP
  .sp
  Uses the internal tag merge algorithm (experimental).
@@ -4281,7 +4394,7 @@
  .sp
  Internal tools are always available and do not require a GUI but will by default
  not handle symlinks or binary files.
[email protected]@ -5822,7 +5795,7 @@
[email protected]@ -6140,7 +6113,7 @@
  .SS Choosing a merge tool
  .sp
  Mercurial uses these rules when deciding which merge tool to use:
@@ -4290,7 +4403,7 @@
  .IP 1. 3
  .
  If a tool has been specified with the \-\-tool option to merge or resolve, it
[email protected]@ -5859,11 +5832,11 @@
[email protected]@ -6177,11 +6150,11 @@
  .IP 8. 3
  .
  The merge of the file fails and must be resolved before commit.
@@ -4304,7 +4417,7 @@
  succeed because of conflicting changes Mercurial will actually execute the
  merge program. Whether to use the simple merge algorithm first can be
  controlled by the premerge setting of the merge tool. Premerge is enabled by
[email protected]@ -5899,7 +5872,7 @@
[email protected]@ -6217,7 +6190,7 @@
  .IP Note
  .
  Patterns specified in \fB.hgignore\fP are not rooted.
@@ -4313,7 +4426,7 @@
  .RE
  .sp
  To use a plain path name without any pattern matching, start it with
[email protected]@ -5928,17 +5901,17 @@
[email protected]@ -6246,17 +6219,17 @@
  Plain examples:
  .sp
  .nf
@@ -4334,7 +4447,7 @@
  glob:*.c       any name ending in ".c" in the current directory
  *.c            any name ending in ".c" in the current directory
  **.c           any name ending in ".c" in any subdirectory of the
[email protected]@ -5946,27 +5919,27 @@
[email protected]@ -6264,27 +6237,27 @@
  foo/*.c        any name ending in ".c" in the directory foo
  foo/**.c       any name ending in ".c" in any subdirectory of foo
                 including itself.
@@ -4368,7 +4481,7 @@
  .SH WORKING WITH PHASES
  .SS What are phases?
  .sp
[email protected]@ -5975,9 +5948,9 @@
[email protected]@ -6293,9 +6266,9 @@
  (for instance, with the mq or rebase extensions).
  .sp
  Each changeset in a repository is in one of the following phases:
@@ -4381,7 +4494,7 @@
  .IP \(bu 2
  .
  public : changeset is visible on a public server
[email protected]@ -5987,9 +5960,9 @@
[email protected]@ -6305,9 +6278,9 @@
  .IP \(bu 2
  .
  secret : changeset should not be pushed, pulled, or cloned
@@ -4394,7 +4507,7 @@
  .sp
  These phases are ordered (public < draft < secret) and no changeset
  can be in a lower phase than its ancestors. For instance, if a
[email protected]@ -6003,14 +5976,14 @@
[email protected]@ -6321,14 +6294,14 @@
  .sp
  Once changesets become public, extensions like mq and rebase will
  refuse to operate on them to prevent creating duplicate changesets.
@@ -4412,7 +4525,7 @@
  \- all draft changesets that are pulled or cloned appear in phase
  public on the client
  
[email protected]@ -6018,7 +5991,7 @@
[email protected]@ -6336,7 +6309,7 @@
  client and server
  
  \- secret changesets are neither pushed, pulled, or cloned
@@ -4421,7 +4534,7 @@
  .fi
  .IP Note
  .
[email protected]@ -6031,13 +6004,13 @@
[email protected]@ -6349,13 +6322,13 @@
  repository to disable publishing in its configuration file:
  .sp
  .nf
@@ -4438,7 +4551,7 @@
  .IP Note
  .
  Servers running older versions of Mercurial are treated as
[email protected]@ -6051,17 +6024,17 @@
[email protected]@ -6369,17 +6342,17 @@
  of the secret changeset may be communicated to the server.
  .RE
  .SS Examples
@@ -4461,7 +4574,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6068,9 +6041,9 @@
[email protected]@ -6386,9 +6359,9 @@
  change all secret changesets to draft:
  .sp
  .nf
@@ -4473,7 +4586,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6077,9 +6050,9 @@
[email protected]@ -6395,9 +6368,9 @@
  forcibly move the current changeset and descendants from public to draft:
  .sp
  .nf
@@ -4485,7 +4598,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6086,9 +6059,9 @@
[email protected]@ -6404,9 +6377,9 @@
  show a list of changeset revision and phase:
  .sp
  .nf
@@ -4497,7 +4610,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6095,15 +6068,15 @@
[email protected]@ -6413,15 +6386,15 @@
  resynchronize draft changesets relative to a remote repository:
  .sp
  .nf
@@ -4519,7 +4632,7 @@
  .SH SPECIFYING SINGLE REVISIONS
  .sp
  Mercurial supports several ways to specify individual revisions.
[email protected]@ -6149,18 +6122,18 @@
[email protected]@ -6467,18 +6440,18 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -4542,7 +4655,7 @@
  .TP
  .B \fBx::y\fP
  .sp
[email protected]@ -6199,18 +6172,18 @@
[email protected]@ -6517,18 +6490,18 @@
  .B \fBx~n\fP
  .sp
  The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
@@ -4565,7 +4678,7 @@
  .TP
  .B \fBadds(pattern)\fP
  .sp
[email protected]@ -6243,7 +6216,7 @@
[email protected]@ -6561,7 +6534,7 @@
  .B \fBbisect(string)\fP
  .sp
  Changesets marked in the specified bisect status:
@@ -4574,7 +4687,7 @@
  .IP \(bu 2
  .
  \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
[email protected]@ -6265,7 +6238,7 @@
[email protected]@ -6583,7 +6556,7 @@
  .IP \(bu 2
  .
  \fBcurrent\fP            : the cset currently being bisected
@@ -4583,7 +4696,7 @@
  .TP
  .B \fBbookmark([name])\fP
  .sp
[email protected]@ -6310,8 +6283,8 @@
[email protected]@ -6628,8 +6601,8 @@
  .TP
  .B \fBcontains(pattern)\fP
  .sp
@@ -4594,7 +4707,7 @@
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
  relative to the current directory and match against a file exactly
[email protected]@ -6324,7 +6297,7 @@
[email protected]@ -6642,7 +6615,7 @@
  .TP
  .B \fBdate(interval)\fP
  .sp
@@ -4603,7 +4716,7 @@
  .TP
  .B \fBdesc(string)\fP
  .sp
[email protected]@ -6376,7 +6349,7 @@
[email protected]@ -6694,7 +6667,7 @@
  .sp
  For performance reasons, visits only revisions mentioned in the file\-level
  filelog, rather than filtering through all changesets (much faster, but
@@ -4612,12 +4725,21 @@
  result, use \fBfile()\fP.
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
[email protected]@ -6389,13 +6362,13 @@
[email protected]@ -6701,7 +6674,7 @@
+ relative to the current directory and match against a file exactly
+ for efficiency.
+ .sp
+-If some linkrev points to revisions filtered by the current repoview, we\(aqll
++If some linkrev points to revisions filtered by the current repoview, we'll
+ work around it to return a non\-filtered value.
+ .TP
+ .B \fBfirst(set, [n])\fP
[email protected]@ -6710,13 +6683,13 @@
  .TP
  .B \fBfollow([file])\fP
  .sp
--An alias for \fB::.\fP (ancestors of the working copy\(aqs first parent).
-+An alias for \fB::.\fP (ancestors of the working copy's first parent).
+-An alias for \fB::.\fP (ancestors of the working directory\(aqs first parent).
++An alias for \fB::.\fP (ancestors of the working directory's first parent).
  If a filename is specified, the history of the given file is followed,
  including copies.
  .TP
@@ -4628,7 +4750,7 @@
  to ensure special escape characters are handled correctly. Unlike
  \fBkeyword(string)\fP, the match is case\-sensitive.
  .TP
[email protected]@ -6511,7 +6484,7 @@
[email protected]@ -6840,7 +6813,7 @@
  .TP
  .B \fBpresent(set)\fP
  .sp
@@ -4637,7 +4759,7 @@
  all revisions in set.
  .sp
  If any of specified revisions is not present in the local repository,
[email protected]@ -6525,7 +6498,7 @@
[email protected]@ -6854,7 +6827,7 @@
  .B \fBremote([id [,path]])\fP
  .sp
  Local revision that corresponds to the given identifier in a
@@ -4646,7 +4768,7 @@
  synonym for the current local branch.
  .TP
  .B \fBremoves(pattern)\fP
[email protected]@ -6558,7 +6531,7 @@
[email protected]@ -6887,7 +6860,7 @@
  as \fB\-key\fP to sort in descending order.
  .sp
  The keys can be:
@@ -4655,16 +4777,16 @@
  .IP \(bu 2
  .
  \fBrev\fP for the revision number,
[email protected]@ -6574,7 +6547,7 @@
[email protected]@ -6903,7 +6876,7 @@
  .IP \(bu 2
  .
  \fBdate\fP for the commit date
 -.UNINDENT
 +.RE
  .TP
- .B \fBtag([name])\fP
- .sp
[email protected]@ -6595,15 +6568,15 @@
+ .B \fBsubrepo([pattern])\fP
+ .sp
[email protected]@ -6929,15 +6902,15 @@
  If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
  a regular expression. To match a user that actually contains \fIre:\fP, use
  the prefix \fIliteral:\fP.
@@ -4683,7 +4805,7 @@
  .fi
  .sp
  in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
[email protected]@ -6613,21 +6586,21 @@
[email protected]@ -6947,12 +6920,12 @@
  For example,
  .sp
  .nf
@@ -4698,7 +4820,27 @@
  .fi
  .sp
  defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
- exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
[email protected]@ -6962,13 +6935,13 @@
+ one string. For example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [revsetalias]
+-issue($1) = grep(r\(aq\ebissue[ :]?\(aq ## $1 ## r\(aq\eb|\ebbug\e(\(aq ## $1 ## r\(aq\e)\(aq)
+-.ft P
++issue($1) = grep(r'\ebissue[ :]?' ## $1 ## r'\eb|\ebbug\e(' ## $1 ## r'\e)')
++.ft
+ .fi
+ .sp
+-\fBissue(1234)\fP is equivalent to \fBgrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\fP
++\fBissue(1234)\fP is equivalent to \fBgrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\fP
+ in this case. This matches against all of "issue 1234", "issue:1234",
+ "issue1234" and "bug(1234)".
+ .sp
[email protected]@ -6975,10 +6948,10 @@
+ All other prefix, infix and postfix operators have lower priority than
+ \fB##\fP. For example, \fB$1 ## $2~2\fP is equivalent to \fB($1 ## $2)~2\fP.
  .sp
 -Command line equivalents for \%\fBhg log\fP\::
 +Command line equivalents for \fBhg log\fP:
@@ -4709,7 +4851,7 @@
  \-f    \->  ::.
  \-d x  \->  date(x)
  \-k x  \->  keyword(x)
[email protected]@ -6636,19 +6609,19 @@
[email protected]@ -6987,19 +6960,19 @@
  \-b x  \->  branch(x)
  \-P x  \->  !::x
  \-l x  \->  limit(expr, x)
@@ -4733,7 +4875,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6655,9 +6628,9 @@
[email protected]@ -7006,9 +6979,9 @@
  Changesets on the default branch since tag 1.5 (excluding merges):
  .sp
  .nf
@@ -4745,7 +4887,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6664,9 +6637,9 @@
[email protected]@ -7015,9 +6988,9 @@
  Open branch heads:
  .sp
  .nf
@@ -4757,7 +4899,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6674,9 +6647,9 @@
[email protected]@ -7025,9 +6998,9 @@
  \fBhgext/*\fP:
  .sp
  .nf
@@ -4770,7 +4912,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6683,9 +6656,9 @@
[email protected]@ -7034,9 +7007,9 @@
  Changesets committed in May 2008, sorted by user:
  .sp
  .nf
@@ -4783,7 +4925,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6693,11 +6666,11 @@
[email protected]@ -7044,11 +7017,11 @@
  release:
  .sp
  .nf
@@ -4798,7 +4940,7 @@
  .SH SUBREPOSITORIES
  .sp
  Subrepositories let you nest external repositories or projects into a
[email protected]@ -6708,7 +6681,7 @@
[email protected]@ -7059,7 +7032,7 @@
  subrepositories.
  .sp
  Subrepositories are made of three components:
@@ -4807,7 +4949,7 @@
  .IP 1. 3
  .
  Nested repository checkouts. They can appear anywhere in the
[email protected]@ -6721,18 +6694,18 @@
[email protected]@ -7072,18 +7045,18 @@
  subrepositories are referenced like:
  .sp
  .nf
@@ -4830,7 +4972,7 @@
  .fi
  .sp
  where \fBpath/to/nested\fP is the checkout location relatively to the
[email protected]@ -6755,7 +6728,7 @@
[email protected]@ -7106,7 +7079,7 @@
  .
  The \fB.hgsubstate\fP file should not be edited manually.
  .RE
@@ -4839,7 +4981,7 @@
  .SS Adding a Subrepository
  .sp
  If \fB.hgsub\fP does not exist, create it and add it to the parent
[email protected]@ -6763,7 +6736,7 @@
[email protected]@ -7114,7 +7087,7 @@
  to live in the parent repository. Edit \fB.hgsub\fP and add the
  subrepository entry as described above. At this point, the
  subrepository is tracked and the next commit will record its state in
@@ -4848,7 +4990,7 @@
  .SS Synchronizing a Subrepository
  .sp
  Subrepos do not automatically track the latest changeset of their
[email protected]@ -6780,7 +6753,7 @@
[email protected]@ -7131,7 +7104,7 @@
  To remove a subrepository from the parent repository, delete its
  reference from \fB.hgsub\fP, then remove its files.
  .SS Interaction with Mercurial Commands
@@ -4857,16 +4999,16 @@
  .TP
  .B add
  .
[email protected]@ -6807,7 +6780,7 @@
[email protected]@ -7166,7 +7139,7 @@
  have been modified, Mercurial will abort.  Mercurial can be made
  to instead commit all modified subrepositories by specifying
  \-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
 -configuration file (see \%\fBhg help config\fP\:).  After there are no
 +configuration file (see \fBhg help config\fP).  After there are no
  longer any modified subrepositories, it records their state and
- finally commits it in the parent repository.
- .TP
[email protected]@ -6838,7 +6811,7 @@
+ finally commits it in the parent repository.  The \-\-addremove
+ option also honors the \-S/\-\-subrepos option.  However, Git and
[email protected]@ -7204,7 +7177,7 @@
  .B pull
  .
  pull is not recursive since it is not clear what to pull prior
@@ -4875,7 +5017,7 @@
  subrepositories changes referenced by the parent repository pulled
  changesets is expensive at best, impossible in the Subversion
  case.
[email protected]@ -6865,7 +6838,7 @@
[email protected]@ -7239,7 +7212,7 @@
  changeset is not available in the current subrepository, Mercurial
  will pull it in first before updating.  This means that updating
  can require network access when using subrepositories.
@@ -4884,7 +5026,7 @@
  .SS Remapping Subrepositories Sources
  .sp
  A subrepository source location may change during a project life,
[email protected]@ -6883,12 +6856,12 @@
[email protected]@ -7257,12 +7230,12 @@
  outgoing, incoming, tip, parents, and heads.
  .sp
  Some built\-in styles are packaged with Mercurial. These can be listed
@@ -4900,7 +5042,7 @@
  .fi
  .sp
  A template is a piece of text, with markup to invoke variable
[email protected]@ -6895,16 +6868,16 @@
[email protected]@ -7269,16 +7242,16 @@
  expansion:
  .sp
  .nf
@@ -4920,7 +5062,7 @@
  .TP
  .B author
  .
[email protected]@ -6948,7 +6921,7 @@
[email protected]@ -7322,7 +7295,7 @@
  .TP
  .B extras
  .
@@ -4929,7 +5071,7 @@
  field of this changeset.
  .TP
  .B file_adds
[email protected]@ -6994,24 +6967,24 @@
[email protected]@ -7368,24 +7341,24 @@
  .TP
  .B p1node
  .
@@ -4958,7 +5100,7 @@
  second parent, or \-1 if the changeset has no second parent.
  .TP
  .B parents
[email protected]@ -7039,24 +7012,24 @@
[email protected]@ -7413,24 +7386,24 @@
  .B tags
  .
  List of strings. Any tags associated with the changeset.
@@ -4988,7 +5130,7 @@
  .TP
  .B addbreaks
  .
[email protected]@ -7144,7 +7117,7 @@
[email protected]@ -7522,7 +7495,7 @@
  .TP
  .B nonempty
  .
@@ -4997,7 +5139,7 @@
  .TP
  .B obfuscate
  .
[email protected]@ -7214,13 +7187,13 @@
[email protected]@ -7596,17 +7569,17 @@
  .
  Any text. Returns a short representation of a user name or email
  address.
@@ -5010,13 +5152,36 @@
  In addition to filters, there are some basic built\-in functions:
 -.INDENT 0.0
 +.RS 0
- .IP \(bu 2
- .
- date(date[, fmt])
[email protected]@ -7272,25 +7245,25 @@
- .IP \(bu 2
- .
- word(number, text[, separator])
+ .TP
+ .B date(date[, fmt])
+ .
+-Format a date. See \%\fBhg help dates\fP\: for formatting
++Format a date. See \fBhg help dates\fP for formatting
+ strings.
+ .TP
+ .B diff([includepattern [, excludepattern]])
[email protected]@ -7650,7 +7623,7 @@
+ a label applied can result in additional post\-processing, such as
+ automatic colorization.
+ .TP
+-.B pad(text, width[, fillchar=\(aq \(aq[, right=False]])
++.B pad(text, width[, fillchar=' '[, right=False]])
+ .
+ Pad text with a
+ fill character.
[email protected]@ -7658,7 +7631,7 @@
+ .B revset(query[, formatargs...])
+ .
+ Execute a revision set query. See
+-\%\fBhg help revset\fP\:.
++\fBhg help revset\fP.
+ .TP
+ .B rstdoc(text, style)
+ .
[email protected]@ -7686,25 +7659,25 @@
+ .B word(number, text[, separator])
+ .
+ Return the nth word from a string.
 -.UNINDENT
 +.RE
  .sp
@@ -5046,7 +5211,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7297,9 +7270,9 @@
[email protected]@ -7711,9 +7684,9 @@
  Join the list of files with a ", ":
  .sp
  .nf
@@ -5059,7 +5224,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7306,9 +7279,9 @@
[email protected]@ -7720,9 +7693,9 @@
  Modify each line of a commit description:
  .sp
  .nf
@@ -5072,7 +5237,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7315,9 +7288,9 @@
[email protected]@ -7729,9 +7702,9 @@
  Format date:
  .sp
  .nf
@@ -5085,7 +5250,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7324,9 +7297,9 @@
[email protected]@ -7738,9 +7711,9 @@
  Output the description set to a fill\-width of 30:
  .sp
  .nf
@@ -5098,7 +5263,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7333,10 +7306,10 @@
[email protected]@ -7747,10 +7720,10 @@
  Use a conditional to test for the default branch:
  .sp
  .nf
@@ -5113,7 +5278,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7343,9 +7316,9 @@
[email protected]@ -7757,9 +7730,9 @@
  Append a newline if not empty:
  .sp
  .nf
@@ -5126,7 +5291,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7352,9 +7325,9 @@
[email protected]@ -7766,9 +7739,9 @@
  Label the output for use with the color extension:
  .sp
  .nf
@@ -5139,7 +5304,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7361,36 +7334,36 @@
[email protected]@ -7775,36 +7748,36 @@
  Invert the firstline filter, i.e. everything but the first line:
  .sp
  .nf
@@ -5191,7 +5356,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7397,9 +7370,9 @@
[email protected]@ -7811,9 +7784,9 @@
  Show only commit descriptions that start with "template":
  .sp
  .nf
@@ -5203,7 +5368,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7406,34 +7379,34 @@
[email protected]@ -7820,34 +7793,34 @@
  Print the first word of each line of a commit message:
  .sp
  .nf
@@ -5248,7 +5413,7 @@
  possible if the feature is explicitly enabled on the remote Mercurial
  server.
  .sp
[email protected]@ -7441,7 +7414,7 @@
[email protected]@ -7855,7 +7828,7 @@
  web.cacerts.
  .sp
  Some notes about using SSH with Mercurial:
@@ -5257,7 +5422,7 @@
  .IP \(bu 2
  .
  SSH requires an accessible shell account on the destination machine
[email protected]@ -7448,63 +7421,63 @@
[email protected]@ -7862,63 +7835,63 @@
  and a copy of hg in the remote path or specified with as remotecmd.
  .IP \(bu 2
  .
@@ -5337,7 +5502,7 @@
  .SH EXTENSIONS
  .sp
  This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
[email protected]@ -7528,7 +7501,7 @@
[email protected]@ -7942,7 +7915,7 @@
  distinguish them.
  .sp
  The order in which access checks are performed is:
@@ -5346,7 +5511,7 @@
  .IP 1. 3
  .
  Deny  list for branches (section \fBacl.deny.branches\fP)
[email protected]@ -7541,7 +7514,7 @@
[email protected]@ -7955,7 +7928,7 @@
  .IP 4. 3
  .
  Allow list for paths    (section \fBacl.allow\fP)
@@ -5355,7 +5520,7 @@
  .sp
  The allow and deny sections take key\-value pairs.
  .SS Branch\-based Access Control
[email protected]@ -7549,7 +7522,7 @@
[email protected]@ -7963,7 +7936,7 @@
  Use the \fBacl.deny.branches\fP and \fBacl.allow.branches\fP sections to
  have branch\-based access control. Keys in these sections can be
  either:
@@ -5364,7 +5529,7 @@
  .IP \(bu 2
  .
  a branch name, or
[email protected]@ -7556,10 +7529,10 @@
[email protected]@ -7970,10 +7943,10 @@
  .IP \(bu 2
  .
  an asterisk, to match any branch;
@@ -5377,7 +5542,7 @@
  .IP \(bu 2
  .
  a comma\-separated list containing users and groups, or
[email protected]@ -7566,7 +7539,7 @@
[email protected]@ -7980,7 +7953,7 @@
  .IP \(bu 2
  .
  an asterisk, to match anyone;
@@ -5386,7 +5551,7 @@
  .sp
  You can add the "!" prefix to a user or group name to invert the sense
  of the match.
[email protected]@ -7588,7 +7561,7 @@
[email protected]@ -8002,7 +7975,7 @@
  .SS Example Configuration
  .sp
  .nf
@@ -5395,7 +5560,7 @@
  [hooks]
  
  # Use this if you want to check access restrictions at commit time
[email protected]@ -7664,12 +7637,12 @@
[email protected]@ -8078,12 +8051,12 @@
  src/main/resources/** = *
  
  \&.hgtags = release_engineer
@@ -5411,7 +5576,7 @@
  be created.
  .sp
  The "!" prefix allows you to prevent anyone except a given user or group to
[email protected]@ -7681,18 +7654,18 @@
[email protected]@ -8095,18 +8068,18 @@
  3) Deny access to a file to anyone but user "gollum"
  .sp
  .nf
@@ -5435,7 +5600,7 @@
  lake = [email protected]
  
  # You can also deny access based on file paths:
[email protected]@ -7701,10 +7674,10 @@
[email protected]@ -8115,10 +8088,10 @@
  # Empty
  
  [acl.deny]
@@ -5449,7 +5614,7 @@
  .fi
  .SS blackbox
  .sp
[email protected]@ -7715,7 +7688,7 @@
[email protected]@ -8129,7 +8102,7 @@
  Examples:
  .sp
  .nf
@@ -5458,7 +5623,7 @@
  [blackbox]
  track = *
  
[email protected]@ -7730,7 +7703,7 @@
[email protected]@ -8144,7 +8117,7 @@
  maxsize = 1.5 MB
  # rotate up to N log files when the current one gets too big
  maxfiles = 3
@@ -5467,7 +5632,7 @@
  .fi
  .SS Commands
  .SS blackbox
[email protected]@ -7738,20 +7711,20 @@
[email protected]@ -8152,20 +8125,20 @@
  view the recent repository events:
  .sp
  .nf
@@ -5492,7 +5657,7 @@
  .SS bugzilla
  .sp
  hooks for integrating with the Bugzilla bug tracker
[email protected]@ -7764,7 +7737,7 @@
[email protected]@ -8178,7 +8151,7 @@
  hours spent working on the bug. Bugs can also be marked fixed.
  .sp
  Three basic modes of access to Bugzilla are provided:
@@ -5501,7 +5666,7 @@
  .IP 1. 3
  .
  Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
[email protected]@ -7776,7 +7749,7 @@
[email protected]@ -8190,7 +8163,7 @@
  .
  Writing directly to the Bugzilla database. Only Bugzilla installations
  using MySQL are supported. Requires Python MySQLdb.
@@ -5510,7 +5675,7 @@
  .sp
  Writing directly to the database is susceptible to schema changes, and
  relies on a Bugzilla contrib script to send out bug change
[email protected]@ -7804,12 +7777,12 @@
[email protected]@ -8218,12 +8191,12 @@
  works on all supported Bugzilla versions.
  .sp
  Configuration items common to all access modes:
@@ -5525,7 +5690,7 @@
  .TP
  .B \fBxmlrpc\fP
  .sp
[email protected]@ -7832,7 +7805,7 @@
[email protected]@ -8246,7 +8219,7 @@
  .sp
  MySQL access, Bugzilla 2.16 and up to but not
  including 2.18.
@@ -5534,7 +5699,7 @@
  .TP
  .B bugzilla.regexp
  .
[email protected]@ -7877,7 +7850,7 @@
[email protected]@ -8291,7 +8264,7 @@
  Template to use when formatting comments. Overrides style if
  specified. In addition to the usual Mercurial keywords, the
  extension specifies:
@@ -5543,7 +5708,7 @@
  .TP
  .B \fB{bug}\fP
  .sp
[email protected]@ -7894,7 +7867,7 @@
[email protected]@ -8308,7 +8281,7 @@
  .B \fB{hgweb}\fP
  .sp
  Base URL for browsing Mercurial repositories.
@@ -5552,7 +5717,7 @@
  .sp
  Default \fBchangeset {node|short} in repo {root} refers to bug
  {bug}.\endetails:\en\et{desc|tabindent}\fP
[email protected]@ -7911,10 +7884,10 @@
[email protected]@ -8325,10 +8298,10 @@
  .
  Base URL for browsing Mercurial repositories. Referenced from
  templates as \fB{hgweb}\fP.
@@ -5565,7 +5730,7 @@
  .TP
  .B bugzilla.usermap
  .
[email protected]@ -7923,13 +7896,13 @@
[email protected]@ -8337,13 +8310,13 @@
  line:
  .sp
  .nf
@@ -5582,7 +5747,7 @@
  .sp
  The \fB[usermap]\fP section is used to specify mappings of Mercurial
  committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
[email protected]@ -7936,7 +7909,7 @@
[email protected]@ -8350,7 +8323,7 @@
  Contains entries of the form \fBcommitter = Bugzilla user\fP.
  .sp
  XMLRPC access mode configuration:
@@ -5591,7 +5756,7 @@
  .TP
  .B bugzilla.bzurl
  .
[email protected]@ -7951,22 +7924,22 @@
[email protected]@ -8365,22 +8338,22 @@
  .B bugzilla.password
  .
  The password for Bugzilla login.
@@ -5618,7 +5783,7 @@
  .TP
  .B bugzilla.host
  .
[email protected]@ -8006,12 +7979,12 @@
[email protected]@ -8420,12 +8393,12 @@
  id) and \fBuser\fP (committer bugzilla email). Default depends on
  version; from 2.18 it is "cd %(bzdir)s && perl \-T
  contrib/sendbugmail.pl %(id)s %(user)s".
@@ -5633,7 +5798,7 @@
  [extensions]
  bugzilla =
  
[email protected]@ -8018,7 +7991,7 @@
[email protected]@ -8432,7 +8405,7 @@
  [hooks]
  # run bugzilla hook on every change pulled or pushed in here
  incoming.bugzilla = python:hgext.bugzilla.hook
@@ -5642,7 +5807,7 @@
  .fi
  .sp
  Example configurations:
[email protected]@ -8030,7 +8003,7 @@
[email protected]@ -8444,7 +8417,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -5651,7 +5816,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -8043,7 +8016,7 @@
[email protected]@ -8457,7 +8430,7 @@
  
  [web]
  baseurl=http://my\-project.org/hg
@@ -5660,7 +5825,7 @@
  .fi
  .sp
  XMLRPC+email example configuration. This uses the Bugzilla at
[email protected]@ -8055,7 +8028,7 @@
[email protected]@ -8469,7 +8442,7 @@
  \[email protected]\-project.org\fP.
  .sp
  .nf
@@ -5669,7 +5834,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -8072,7 +8045,7 @@
[email protected]@ -8486,7 +8459,7 @@
  
  [usermap]
  [email protected][email protected]
@@ -5678,7 +5843,7 @@
  .fi
  .sp
  MySQL example configuration. This has a local Bugzilla 3.2 installation
[email protected]@ -8083,7 +8056,7 @@
[email protected]@ -8497,7 +8470,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -5687,7 +5852,7 @@
  [bugzilla]
  host=localhost
  password=XYZZY
[email protected]@ -8100,25 +8073,25 @@
[email protected]@ -8514,18 +8487,18 @@
  
  [usermap]
  [email protected][email protected]
@@ -5707,6 +5872,49 @@
 -.ft P
 +.ft
  .fi
+ .SS censor
+ .sp
[email protected]@ -8539,14 +8512,14 @@
+ Typical uses for censor are due to security or legal requirements, including:
+ .sp
+ .nf
+-.ft C
++.ft
+ * Passwords, private keys, crytographic material
+ * Licensed data/code/libraries for which the license has expired
+ * Personally Identifiable Information or other private data
+-.ft P
++.ft
+ .fi
+ .sp
+-Censored nodes can interrupt mercurial\(aqs typical operation whenever the excised
++Censored nodes can interrupt mercurial's typical operation whenever the excised
+ data needs to be materialized. Some commands, like \fBhg cat\fP/\fBhg revert\fP,
+ simply fail when asked to produce censored data. Others, like \fBhg verify\fP and
+ \fBhg update\fP, must be capable of tolerating censored data to continue to
[email protected]@ -8556,13 +8529,13 @@
+ .SS censor
+ .sp
+ .nf
+-.ft C
++.ft
+ hg censor \-r REV [\-t TEXT] [FILE]
+-.ft P
++.ft
+ .fi
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .BI \-r,  \-\-rev \ <REV>
+ .
[email protected]@ -8571,13 +8544,13 @@
+ .BI \-t,  \-\-tombstone \ <TEXT>
+ .
+ replacement tombstone data
+-.UNINDENT
++.RE
  .SS children
  .sp
  command to display child changesets (DEPRECATED)
@@ -5718,7 +5926,7 @@
  .SS Commands
  .SS children
  .sp
[email protected]@ -8125,12 +8098,12 @@
[email protected]@ -8584,12 +8557,12 @@
  show the children of the given or working directory revision:
  .sp
  .nf
@@ -5734,7 +5942,7 @@
  revision is given via \-r/\-\-rev, the children of that revision will
  be printed. If a file argument is given, revision in which the
  file was last changed (after the working directory revision or the
[email protected]@ -8137,7 +8110,7 @@
[email protected]@ -8596,7 +8569,7 @@
  argument to \-\-rev if given) is printed.
  .sp
  Options:
@@ -5743,7 +5951,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -8150,7 +8123,7 @@
[email protected]@ -8609,7 +8582,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -5752,7 +5960,7 @@
  .SS churn
  .sp
  command to display statistics about repository history
[email protected]@ -8160,9 +8133,9 @@
[email protected]@ -8619,9 +8592,9 @@
  histogram of changes to the repository:
  .sp
  .nf
@@ -5764,7 +5972,7 @@
  .fi
  .sp
  This command will display a histogram representing the number
[email protected]@ -8178,7 +8151,7 @@
[email protected]@ -8637,7 +8610,7 @@
  Examples:
  .sp
  .nf
@@ -5773,7 +5981,7 @@
  # display count of changed lines for every committer
  hg churn \-t "{author|email}"
  
[email protected]@ -8190,7 +8163,7 @@
[email protected]@ -8649,7 +8622,7 @@
  
  # display count of lines changed in every year
  hg churn \-f "%Y" \-s
@@ -5782,7 +5990,7 @@
  .fi
  .sp
  It is possible to map alternate email addresses to a main address
[email protected]@ -8197,9 +8170,9 @@
[email protected]@ -8656,9 +8629,9 @@
  by providing a file using the following format:
  .sp
  .nf
@@ -5794,7 +6002,7 @@
  .fi
  .sp
  Such a file may be specified with the \-\-aliases option, otherwise
[email protected]@ -8207,7 +8180,7 @@
[email protected]@ -8666,7 +8639,7 @@
  Aliases will be split from the rightmost "=".
  .sp
  Options:
@@ -5803,7 +6011,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -8248,7 +8221,7 @@
[email protected]@ -8711,7 +8684,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -5812,7 +6020,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS color
[email protected]@ -8268,10 +8241,10 @@
[email protected]@ -8731,10 +8704,10 @@
  available, then effects are rendered with the ECMA\-48 SGR control
  function (aka ANSI escape codes).
  .sp
@@ -5827,7 +6035,7 @@
  Some may not be available for a given terminal type, and will be
  silently ignored.
  .SS Labels
[email protected]@ -8278,8 +8251,8 @@
[email protected]@ -8741,8 +8714,8 @@
  .sp
  Text receives color effects depending on the labels that it has. Many
  default Mercurial commands emit labelled text. You can also define
@@ -5838,7 +6046,7 @@
  that case, effects given to the last label will override any other
  effects. This includes the special "none" effect, which nullifies
  other effects.
[email protected]@ -8287,18 +8260,18 @@
[email protected]@ -8750,18 +8723,18 @@
  Labels are normally invisible. In order to see these labels and their
  position in the text, use the global \-\-color=debug option. The same
  anchor text may be associated to multiple labels, e.g.
@@ -5862,7 +6070,7 @@
  [color]
  status.modified = blue bold underline red_background
  status.added = green bold
[email protected]@ -8307,7 +8280,7 @@
[email protected]@ -8770,7 +8743,7 @@
  status.unknown = magenta bold underline
  status.ignored = black bold
  
@@ -5871,7 +6079,7 @@
  status.clean = none
  status.copied = none
  
[email protected]@ -8352,7 +8325,7 @@
[email protected]@ -8815,7 +8788,7 @@
  shelve.name = blue bold
  
  histedit.remaining = red bold
@@ -5880,7 +6088,7 @@
  .fi
  .SS Custom colors
  .sp
[email protected]@ -8361,18 +8334,18 @@
[email protected]@ -8824,18 +8797,18 @@
  for your terminal type, assuming terminfo mode.  For instance:
  .sp
  .nf
@@ -5905,7 +6113,7 @@
  .SS Modes
  .sp
  By default, the color extension will use ANSI mode (or win32 mode on
[email protected]@ -8380,19 +8353,19 @@
[email protected]@ -8843,19 +8816,19 @@
  terminfo mode, for example), set the following configuration option:
  .sp
  .nf
@@ -5929,7 +6137,21 @@
  either using ansi mode (or auto mode), or by using less \-r (which will
  pass through all terminal control codes, not just color control
  codes).
[email protected]@ -8406,13 +8379,13 @@
[email protected]@ -8866,11 +8839,11 @@
+ the pager is active:
+ .sp
+ .nf
+-.ft C
++.ft
+ [color]
+ mode = auto
+ pagermode = ansi
+-.ft P
++.ft
+ .fi
+ .sp
+ If \fBpagermode\fP is not defined, the \fBmode\fP will be used.
[email protected]@ -8884,13 +8857,13 @@
  convert a foreign SCM repository to a Mercurial one.:
  .sp
  .nf
@@ -5946,7 +6168,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
[email protected]@ -8440,10 +8413,10 @@
[email protected]@ -8918,10 +8891,10 @@
  .IP \(bu 2
  .
  Perforce [p4]
@@ -5959,7 +6181,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
[email protected]@ -8450,7 +8423,7 @@
[email protected]@ -8928,7 +8901,7 @@
  .IP \(bu 2
  .
  Subversion [svn] (history on branches is not preserved)
@@ -5968,7 +6190,7 @@
  .sp
  If no revision is given, all revisions will be converted.
  Otherwise, convert will only import up to the named revision
[email protected]@ -8458,12 +8431,12 @@
[email protected]@ -8936,12 +8909,12 @@
  .sp
  If no destination directory name is specified, it defaults to the
  basename of the source with \fB\-hg\fP appended. If the destination
@@ -5983,7 +6205,7 @@
  .TP
  .B \-\-branchsort
  .
[email protected]@ -8488,21 +8461,21 @@
[email protected]@ -8966,21 +8939,21 @@
  try to move closed revisions as close as possible
  to parent branches, only supported by Mercurial
  sources.
@@ -6011,7 +6233,7 @@
  and can be run repeatedly to copy new commits.
  .sp
  The authormap is a simple text file that maps each source commit
[email protected]@ -8511,9 +8484,9 @@
[email protected]@ -8989,9 +8962,9 @@
  author mapping and the line format is:
  .sp
  .nf
@@ -6023,7 +6245,7 @@
  .fi
  .sp
  Empty lines and lines starting with a \fB#\fP are ignored.
[email protected]@ -8523,13 +8496,13 @@
[email protected]@ -9001,13 +8974,13 @@
  directives:
  .sp
  .nf
@@ -6039,7 +6261,7 @@
  .fi
  .sp
  Comment lines start with \fB#\fP. A specified path matches if it
[email protected]@ -8562,9 +8535,9 @@
[email protected]@ -9040,9 +9013,9 @@
  comma\-separated values:
  .sp
  .nf
@@ -6051,7 +6273,7 @@
  .fi
  .sp
  The key is the revision ID in the source
[email protected]@ -8584,9 +8557,9 @@
[email protected]@ -9062,9 +9035,9 @@
  lines of the form:
  .sp
  .nf
@@ -6063,7 +6285,7 @@
  .fi
  .sp
  where "original_branch_name" is the name of the branch in the
[email protected]@ -8598,7 +8571,7 @@
[email protected]@ -9076,7 +9049,7 @@
  .sp
  The Mercurial source recognizes the following configuration
  options, which you can set on the command line with \fB\-\-config\fP:
@@ -6072,7 +6294,7 @@
  .TP
  .B convert.hg.ignoreerrors
  .
[email protected]@ -8615,7 +8588,7 @@
[email protected]@ -9093,7 +9066,7 @@
  .B convert.hg.revs
  .
  revset specifying the source revisions to convert.
@@ -6081,7 +6303,7 @@
  .SS CVS Source
  .sp
  CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
[email protected]@ -8629,7 +8602,7 @@
[email protected]@ -9107,7 +9080,7 @@
  sandbox is ignored.
  .sp
  The following options can be used with \fB\-\-config\fP:
@@ -6090,7 +6312,7 @@
  .TP
  .B convert.cvsps.cache
  .
[email protected]@ -8680,7 +8653,7 @@
[email protected]@ -9158,7 +9131,7 @@
  the changesets are calculated from the CVS log. The
  function is passed a list with the changeset entries, and can
  modify the changesets in\-place, or add or delete them.
@@ -6099,7 +6321,7 @@
  .sp
  An additional "debugcvsps" Mercurial command allows the builtin
  changeset merging code to be run without doing a conversion. Its
[email protected]@ -8700,7 +8673,7 @@
[email protected]@ -9178,7 +9151,7 @@
  detection.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -6108,7 +6330,7 @@
  .TP
  .B convert.svn.branches
  .
[email protected]@ -8722,28 +8695,28 @@
[email protected]@ -9200,28 +9173,28 @@
  use local time (as determined by the TZ
  environment variable) for changeset date/times. The default
  is False (use UTC).
@@ -6142,7 +6364,7 @@
  .TP
  .B convert.git.similarity
  .
[email protected]@ -8751,7 +8724,7 @@
[email protected]@ -9229,7 +9202,7 @@
  commit must be to be imported as renames or copies, as a
  percentage between \fB0\fP (disabled) and \fB100\fP (files must be
  identical). For example, \fB90\fP means that a delete/add pair will
@@ -6151,7 +6373,7 @@
  changed. The default is \fB50\fP.
  .TP
  .B convert.git.findcopiesharder
[email protected]@ -8760,7 +8733,7 @@
[email protected]@ -9238,7 +9211,7 @@
  files in the working copy instead of just changed ones. This
  is very expensive for large projects, and is only effective when
  \fBconvert.git.similarity\fP is greater than 0. The default is False.
@@ -6160,7 +6382,7 @@
  .SS Perforce Source
  .sp
  The Perforce (P4) importer can be given a p4 depot path or a
[email protected]@ -8772,17 +8745,17 @@
[email protected]@ -9250,17 +9223,17 @@
  .sp
  It is possible to limit the amount of source history to be
  converted by specifying an initial Perforce revision:
@@ -6181,7 +6403,7 @@
  .TP
  .B convert.hg.clonebranches
  .
[email protected]@ -8798,10 +8771,10 @@
[email protected]@ -9276,10 +9249,10 @@
  .
  preserve branch names. The default is
  True.
@@ -6194,7 +6416,7 @@
  .TP
  .BI \-\-authors \ <FILE>
  .
[email protected]@ -8854,7 +8827,7 @@
[email protected]@ -9332,7 +9305,7 @@
  .B \-\-closesort
  .
  try to reorder closed revisions
@@ -6203,16 +6425,16 @@
  .SS eol
  .sp
  automatically manage newlines in repository files
[email protected]@ -8866,7 +8839,7 @@
[email protected]@ -9344,7 +9317,7 @@
  .sp
  The extension reads its configuration from a versioned \fB.hgeol\fP
- configuration file found in the root of the working copy. The
+ configuration file found in the root of the working directory. The
 -\fB.hgeol\fP file use the same syntax as all other Mercurial
 +\fB\&.hgeol\fP file use the same syntax as all other Mercurial
  configuration files. It uses two sections, \fB[patterns]\fP and
  \fB[repository]\fP.
  .sp
[email protected]@ -8879,9 +8852,9 @@
[email protected]@ -9357,9 +9330,9 @@
  Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
  checked out and stored in the repository in that format and files
  declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
@@ -6224,7 +6446,7 @@
  default behaviour; it is only needed if you need to override a later,
  more general pattern.
  .sp
[email protected]@ -8898,7 +8871,7 @@
[email protected]@ -9376,7 +9349,7 @@
  Example versioned \fB.hgeol\fP file:
  .sp
  .nf
@@ -6233,7 +6455,7 @@
  [patterns]
  **.py = native
  **.vcproj = CRLF
[email protected]@ -8908,7 +8881,7 @@
[email protected]@ -9386,7 +9359,7 @@
  
  [repository]
  native = LF
@@ -6242,7 +6464,7 @@
  .fi
  .IP Note
  .
[email protected]@ -8920,12 +8893,12 @@
[email protected]@ -9398,12 +9371,12 @@
  normal Mercurial configuration files and the \fB.hgeol\fP file, with the
  latter overriding the former. You can use that section to control the
  overall behavior. There are three settings:
@@ -6257,7 +6479,7 @@
  generate an archive where files have line endings for Windows.
  .IP \(bu 2
  .
[email protected]@ -8939,7 +8912,7 @@
[email protected]@ -9417,7 +9390,7 @@
  \fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
  ensure that converted files end with a EOL character (either \fB\en\fP
  or \fB\er\en\fP as per the configured patterns).
@@ -6266,7 +6488,7 @@
  .sp
  The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
  like the deprecated win32text extension does. This means that you can
[email protected]@ -8955,7 +8928,7 @@
[email protected]@ -9433,7 +9406,7 @@
  \fBeol.checkallhook\fP hook. These hooks are best used as
  \fBpretxnchangegroup\fP hooks.
  .sp
@@ -6275,7 +6497,7 @@
  used.
  .SS extdiff
  .sp
[email protected]@ -8968,12 +8941,12 @@
[email protected]@ -9446,12 +9419,12 @@
  files to compare.
  .sp
  The extdiff extension also allows you to configure new diff commands, so
@@ -6291,7 +6513,7 @@
  cdiff = gdiff \-Nprc5
  ## or the old way:
  #cmd.cdiff = gdiff
[email protected]@ -8990,20 +8963,20 @@
[email protected]@ -9467,20 +9440,20 @@
  # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
  # your .vimrc
  vimdiff = gvim \-f "+next" \e
@@ -6316,7 +6538,7 @@
  .fi
  .sp
  The extdiff extension will look in your [diff\-tools] and [merge\-tools]
[email protected]@ -9010,17 +8983,17 @@
[email protected]@ -9487,17 +9460,17 @@
  sections for diff tool arguments, when none are specified in [extdiff].
  .sp
  .nf
@@ -6338,7 +6560,7 @@
  needed files, so running the external diff program will actually be
  pretty fast (at least faster than having to compare the entire tree).
  .SS Commands
[email protected]@ -9029,9 +9002,9 @@
[email protected]@ -9506,9 +9479,9 @@
  use external program to diff repository (or selected files):
  .sp
  .nf
@@ -6350,7 +6572,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files, using
[email protected]@ -9050,7 +9023,7 @@
[email protected]@ -9527,7 +9500,7 @@
  to its parent.
  .sp
  Options:
@@ -6359,7 +6581,7 @@
  .TP
  .BI \-p,  \-\-program \ <CMD>
  .
[email protected]@ -9075,7 +9048,7 @@
[email protected]@ -9552,7 +9525,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6368,7 +6590,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS factotum
[email protected]@ -9091,9 +9064,9 @@
[email protected]@ -9568,9 +9541,9 @@
  By default, keys are specified as:
  .sp
  .nf
@@ -6380,7 +6602,7 @@
  .fi
  .sp
  If the factotum extension is unable to read the required key, one will be
[email protected]@ -9103,12 +9076,12 @@
[email protected]@ -9580,12 +9553,12 @@
  default, these entries are:
  .sp
  .nf
@@ -6395,7 +6617,7 @@
  .fi
  .sp
  The executable entry defines the full path to the factotum binary. The
[email protected]@ -9123,9 +9096,9 @@
[email protected]@ -9600,9 +9573,9 @@
  pull changes from a remote repository, merge new changes if needed.:
  .sp
  .nf
@@ -6407,7 +6629,7 @@
  .fi
  .sp
  This finds all changes from the repository at the specified path
[email protected]@ -9140,12 +9113,12 @@
[email protected]@ -9617,12 +9590,12 @@
  the newly pulled changes. Local changes are then merged into the
  pulled changes. To switch the merge order, use \-\-switch\-parent.
  .sp
@@ -6422,7 +6644,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -9190,7 +9163,7 @@
[email protected]@ -9667,7 +9640,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -6431,7 +6653,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS gpg
[email protected]@ -9202,9 +9175,9 @@
[email protected]@ -9679,9 +9652,9 @@
  verify all the signatures there may be for a particular revision:
  .sp
  .nf
@@ -6443,7 +6665,7 @@
  .fi
  .sp
  verify all the signatures there may be for a particular revision
[email protected]@ -9213,18 +9186,18 @@
[email protected]@ -9690,18 +9663,18 @@
  add a signature for the current or given revision:
  .sp
  .nf
@@ -6466,7 +6688,7 @@
  .TP
  .B \-l,  \-\-local
  .
[email protected]@ -9257,15 +9230,15 @@
[email protected]@ -9734,15 +9707,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -6485,7 +6707,7 @@
  .fi
  .sp
  list signed changesets
[email protected]@ -9285,9 +9258,9 @@
[email protected]@ -9762,9 +9735,9 @@
  show revision history alongside an ASCII revision graph:
  .sp
  .nf
@@ -6497,7 +6719,7 @@
  .fi
  .sp
  Print a revision history alongside a revision graph drawn with
[email protected]@ -9297,7 +9270,7 @@
[email protected]@ -9774,7 +9747,7 @@
  directory.
  .sp
  Options:
@@ -6506,7 +6728,7 @@
  .TP
  .B \-f,  \-\-follow
  .
[email protected]@ -9386,7 +9359,7 @@
[email protected]@ -9863,7 +9836,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6515,7 +6737,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS hgcia
[email protected]@ -9397,7 +9370,7 @@
[email protected]@ -9874,7 +9847,7 @@
  configure it, set the following options in your hgrc:
  .sp
  .nf
@@ -6524,7 +6746,7 @@
  [cia]
  # your registered CIA user name
  user = foo
[email protected]@ -9429,7 +9402,7 @@
[email protected]@ -9906,7 +9879,7 @@
  [web]
  # If you want hyperlinks (optional)
  baseurl = http://server/path/to/repo
@@ -6533,7 +6755,7 @@
  .fi
  .SS hgk
  .sp
[email protected]@ -9441,19 +9414,18 @@
[email protected]@ -9918,19 +9891,18 @@
  .sp
  hgk consists of two parts: a Tcl script that does the displaying and
  querying of information, and an extension to Mercurial named hgk.py,
@@ -6560,7 +6782,7 @@
  .fi
  .sp
  hgk can make use of the extdiff extension to visualize revisions.
[email protected]@ -9460,10 +9432,10 @@
[email protected]@ -9937,10 +9909,10 @@
  Assuming you had already configured extdiff vdiff command, just add:
  .sp
  .nf
@@ -6573,7 +6795,7 @@
  .fi
  .sp
  Revisions context menu will now display additional entries to fire
[email protected]@ -9474,37 +9446,37 @@
[email protected]@ -9951,37 +9923,37 @@
  start interactive history viewer:
  .sp
  .nf
@@ -6619,7 +6841,7 @@
  .SS histedit
  .sp
  interactive history editing
[email protected]@ -9513,7 +9485,7 @@
[email protected]@ -9990,7 +9962,7 @@
  is as follows, assuming the following history:
  .sp
  .nf
@@ -6628,7 +6850,7 @@
  @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
  |    Add delta
  |
[email protected]@ -9525,7 +9497,7 @@
[email protected]@ -10002,7 +9974,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6637,7 +6859,7 @@
  .fi
  .sp
  If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
[email protected]@ -9532,7 +9504,7 @@
[email protected]@ -10009,7 +9981,7 @@
  file open in your editor:
  .sp
  .nf
@@ -6646,7 +6868,7 @@
  pick c561b4e977df Add beta
  pick 030b686bedc4 Add gamma
  pick 7c2fd3b9020c Add delta
[email protected]@ -9545,11 +9517,11 @@
[email protected]@ -10022,11 +9994,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -6660,7 +6882,7 @@
  .fi
  .sp
  In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
[email protected]@ -9558,7 +9530,7 @@
[email protected]@ -10035,7 +10007,7 @@
  would reorganize the file to look like this:
  .sp
  .nf
@@ -6669,7 +6891,7 @@
  pick 030b686bedc4 Add gamma
  pick c561b4e977df Add beta
  fold 7c2fd3b9020c Add delta
[email protected]@ -9571,11 +9543,11 @@
[email protected]@ -10048,11 +10020,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -6683,7 +6905,7 @@
  .fi
  .sp
  At which point you close the editor and \fBhistedit\fP starts working. When you
[email protected]@ -9583,21 +9555,21 @@
[email protected]@ -10060,21 +10032,21 @@
  those revisions together, offering you a chance to clean up the commit message:
  .sp
  .nf
@@ -6709,7 +6931,7 @@
  @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
  |    Add beta and delta.
  |
[email protected]@ -9606,12 +9578,12 @@
[email protected]@ -10083,12 +10055,12 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6724,7 +6946,7 @@
  it had to run strip twice. Strip can be slow depending on a variety of factors,
  so you might need to be a little patient. You can choose to keep the original
  revisions by passing the \fB\-\-keep\fP flag.
[email protected]@ -9618,20 +9590,20 @@
[email protected]@ -10095,20 +10067,20 @@
  .sp
  The \fBedit\fP operation will drop you back to a command prompt,
  allowing you to edit files freely, or even use \fBhg record\fP to commit
@@ -6751,7 +6973,7 @@
  much work it will be to rearrange history, or that you made a mistake,
  you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
  have made and return to the state before you attempted to edit your
[email protected]@ -9641,7 +9613,7 @@
[email protected]@ -10118,7 +10090,7 @@
  changes, such that we have the following history:
  .sp
  .nf
@@ -6760,7 +6982,7 @@
  @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
  |    Add theta
  |
[email protected]@ -9662,7 +9634,7 @@
[email protected]@ -10139,7 +10111,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6769,7 +6991,20 @@
  .fi
  .sp
  If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
[email protected]@ -9675,9 +9647,9 @@
[email protected]@ -10152,10 +10124,10 @@
+ configuration file:
+ .sp
+ .nf
+-.ft C
++.ft
+ [histedit]
+ linelen = 120      # truncate rule lines at 120 characters
+-.ft P
++.ft
+ .fi
+ .SS Commands
+ .SS histedit
[email protected]@ -10163,9 +10135,9 @@
  interactively edit changeset history:
  .sp
  .nf
@@ -6781,7 +7016,7 @@
  .fi
  .sp
  This command edits changesets between ANCESTOR and the parent of
[email protected]@ -9685,7 +9657,7 @@
[email protected]@ -10173,7 +10145,7 @@
  .sp
  With \-\-outgoing, this edits changesets not found in the
  destination repository. If URL of the destination is omitted, the
@@ -6790,7 +7025,7 @@
  .sp
  For safety, this command is aborted, also if there are ambiguous
  outgoing revisions which may confuse users: for example, there are
[email protected]@ -9693,7 +9665,7 @@
[email protected]@ -10181,7 +10153,7 @@
  .sp
  Use "min(outgoing() and ::.)" or similar revset specification
  instead of \-\-outgoing to specify edit target revision exactly in
@@ -6799,16 +7034,16 @@
  selecting revisions.
  .sp
  Returns 0 on success, 1 if user intervention is required (not only
[email protected]@ -9701,7 +9673,7 @@
[email protected]@ -10189,7 +10161,7 @@
  conflicts).
  .sp
  Options:
 -.INDENT 0.0
 +.RS 0
  .TP
- .BI \-\-commands \ <VALUE>
- .
[email protected]@ -9713,7 +9685,7 @@
+ .BI \-\-commands \ <FILE>
+ .
[email protected]@ -10205,7 +10177,7 @@
  .TP
  .B \-k,  \-\-keep
  .
@@ -6817,8 +7052,8 @@
  .TP
  .B \-\-abort
  .
[email protected]@ -9730,7 +9702,7 @@
- .BI \-r,  \-\-rev \ <VALUE[+]>
[email protected]@ -10222,7 +10194,7 @@
+ .BI \-r,  \-\-rev \ <REV[+]>
  .
  first revision to be edited
 -.UNINDENT
@@ -6826,7 +7061,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS keyword
[email protected]@ -9753,7 +9725,7 @@
[email protected]@ -10245,7 +10217,7 @@
  Example:
  .sp
  .nf
@@ -6835,7 +7070,7 @@
  [keyword]
  # expand keywords in every python file except those matching "x*"
  **.py =
[email protected]@ -9762,7 +9734,7 @@
[email protected]@ -10254,7 +10226,7 @@
  [keywordset]
  # prefer svn\- over cvs\-like default keywordmaps
  svn = True
@@ -6844,7 +7079,7 @@
  .fi
  .IP Note
  .
[email protected]@ -9771,11 +9743,11 @@
[email protected]@ -10263,11 +10235,11 @@
  .RE
  .sp
  For [keywordmaps] template mapping and expansion demonstration and
@@ -6858,7 +7093,7 @@
  .TP
  .B \fButcdate\fP
  .sp
[email protected]@ -9788,20 +9760,20 @@
[email protected]@ -10280,20 +10252,20 @@
  .B \fBsvnisodate\fP
  .sp
  "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
@@ -6885,7 +7120,7 @@
  {desc}" expands to the first line of the changeset description.
  .SS Commands
  .SS kwdemo
[email protected]@ -9809,9 +9781,9 @@
[email protected]@ -10301,9 +10273,9 @@
  print [keywordmaps] configuration and an expansion example:
  .sp
  .nf
@@ -6897,7 +7132,7 @@
  .fi
  .sp
  Show current, custom, or default keyword template maps and their
[email protected]@ -9822,10 +9794,10 @@
[email protected]@ -10314,10 +10286,10 @@
  .sp
  Use \-d/\-\-default to disable current configuration.
  .sp
@@ -6910,7 +7145,7 @@
  .TP
  .B \-d,  \-\-default
  .
[email protected]@ -9834,15 +9806,15 @@
[email protected]@ -10326,15 +10298,15 @@
  .BI \-f,  \-\-rcfile \ <FILE>
  .
  read maps from rcfile
@@ -6929,7 +7164,7 @@
  .fi
  .sp
  Run after (re)enabling keyword expansion.
[email protected]@ -9850,7 +9822,7 @@
[email protected]@ -10342,7 +10314,7 @@
  kwexpand refuses to run if given files contain local changes.
  .sp
  Options:
@@ -6938,7 +7173,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -9859,7 +9831,7 @@
[email protected]@ -10351,7 +10323,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6947,7 +7182,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwfiles
[email protected]@ -9867,9 +9839,9 @@
[email protected]@ -10359,9 +10331,9 @@
  show files configured for keyword expansion:
  .sp
  .nf
@@ -6959,7 +7194,7 @@
  .fi
  .sp
  List which files in the working directory are matched by the
[email protected]@ -9879,7 +9851,7 @@
[email protected]@ -10371,7 +10343,7 @@
  execution by including only files that are actual candidates for
  expansion.
  .sp
@@ -6968,7 +7203,7 @@
  inclusion and exclusion of files.
  .sp
  With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
[email protected]@ -9886,16 +9858,16 @@
[email protected]@ -10378,16 +10350,16 @@
  of files are:
  .sp
  .nf
@@ -6988,7 +7223,7 @@
  .TP
  .B \-A,  \-\-all
  .
[email protected]@ -9916,7 +9888,7 @@
[email protected]@ -10408,7 +10380,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6997,7 +7232,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwshrink
[email protected]@ -9924,9 +9896,9 @@
[email protected]@ -10416,9 +10388,9 @@
  revert expanded keywords in the working directory:
  .sp
  .nf
@@ -7009,7 +7244,7 @@
  .fi
  .sp
  Must be run before changing/disabling active keywords.
[email protected]@ -9934,7 +9906,7 @@
[email protected]@ -10426,7 +10398,7 @@
  kwshrink refuses to run if given files contain local changes.
  .sp
  Options:
@@ -7018,7 +7253,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -9943,7 +9915,7 @@
[email protected]@ -10435,7 +10407,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7027,7 +7262,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS largefiles
[email protected]@ -9952,10 +9924,10 @@
[email protected]@ -10444,10 +10416,10 @@
  .sp
  Large binary files tend to be not very compressible, not very
  diffable, and not at all mergeable. Such files are not handled
@@ -7040,7 +7275,7 @@
  problems by adding a centralized client\-server layer on top of
  Mercurial: largefiles live in a \fIcentral store\fP out on the network
  somewhere, and you only fetch the revisions that you need when you
[email protected]@ -9967,18 +9939,18 @@
[email protected]@ -10459,18 +10431,18 @@
  identified by the SHA\-1 hash of their contents, which is written to
  the standin. largefiles uses that revision ID to get/put largefile
  revisions from/to the central store. This saves both disk space and
@@ -7064,7 +7299,7 @@
  .fi
  .sp
  When you push a changeset that adds/modifies largefiles to a remote
[email protected]@ -9995,8 +9967,8 @@
[email protected]@ -10487,8 +10459,8 @@
  copy to the latest pulled revision (and thereby downloading any new
  largefiles).
  .sp
@@ -7075,7 +7310,7 @@
  .sp
  If you know you are pulling from a non\-default location and want to
  download all the largefiles that correspond to the new changesets at
[email protected]@ -10015,12 +9987,12 @@
[email protected]@ -10507,12 +10479,12 @@
  If you already have large files tracked by Mercurial without the
  largefiles extension, you will need to convert your repository in
  order to benefit from largefiles. This is done with the
@@ -7091,7 +7326,7 @@
  .fi
  .sp
  In repositories that already have largefiles in them, any new file
[email protected]@ -10030,20 +10002,20 @@
[email protected]@ -10522,20 +10494,20 @@
  \-\-lfsize option to the add command (also in megabytes):
  .sp
  .nf
@@ -7116,7 +7351,7 @@
  [largefiles]
  patterns =
    *.jpg
[email protected]@ -10050,7 +10022,7 @@
[email protected]@ -10542,7 +10514,7 @@
    re:.*\e.(png|bmp)$
    library.zip
    content/audio/*
@@ -7125,7 +7360,7 @@
  .fi
  .sp
  Files that match one of these patterns will be added as largefiles
[email protected]@ -10059,7 +10031,7 @@
[email protected]@ -10551,7 +10523,7 @@
  The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
  will be ignored for any repositories not already containing a
  largefile. To add the first largefile to a repository, you must
@@ -7134,7 +7369,7 @@
  command.
  .SS Commands
  .SS lfconvert
[email protected]@ -10067,9 +10039,9 @@
[email protected]@ -10559,9 +10531,9 @@
  convert a normal repository to a largefiles repository:
  .sp
  .nf
@@ -7146,7 +7381,7 @@
  .fi
  .sp
  Convert repository SOURCE to a new repository DEST, identical to
[email protected]@ -10089,7 +10061,7 @@
[email protected]@ -10581,7 +10553,7 @@
  this, the DEST repository can be used without largefiles at all.
  .sp
  Options:
@@ -7155,7 +7390,7 @@
  .TP
  .BI \-s,  \-\-size \ <SIZE>
  .
[email protected]@ -10098,33 +10070,33 @@
[email protected]@ -10590,33 +10562,33 @@
  .B \-\-to\-normal
  .
  convert from a largefiles repo to a normal repo
@@ -7197,7 +7432,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -10131,14 +10103,14 @@
[email protected]@ -10623,14 +10595,14 @@
  pull largefiles on the default branch:
  .sp
  .nf
@@ -7216,7 +7451,7 @@
  .TP
  .BI \-r,  \-\-rev \ <VALUE[+]>
  .
[email protected]@ -10155,7 +10127,7 @@
[email protected]@ -10647,7 +10619,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -7225,7 +7460,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS mq
[email protected]@ -10169,10 +10141,10 @@
[email protected]@ -10661,10 +10633,10 @@
  Known patches are represented as patch files in the .hg/patches
  directory. Applied patches are both patch files and changesets.
  .sp
@@ -7238,7 +7473,7 @@
  create new patch                          qnew
  import existing patch                     qimport
  
[email protected]@ -10182,7 +10154,7 @@
[email protected]@ -10674,7 +10646,7 @@
  add known patch to applied stack          qpush
  remove patch from applied stack           qpop
  refresh contents of top applied patch     qrefresh
@@ -7247,7 +7482,7 @@
  .fi
  .sp
  By default, mq will automatically use git patches when required to
[email protected]@ -10190,29 +10162,29 @@
[email protected]@ -10682,29 +10654,29 @@
  files creations or deletions. This behaviour can be configured with:
  .sp
  .nf
@@ -7286,7 +7521,7 @@
  .sp
  If the working directory contains uncommitted files, qpush, qpop and
  qgoto abort immediately. If \-f/\-\-force is used, the changes are
[email protected]@ -10219,10 +10191,10 @@
[email protected]@ -10711,10 +10683,10 @@
  discarded. Setting:
  .sp
  .nf
@@ -7299,7 +7534,7 @@
  .fi
  .sp
  make them behave as if \-\-keep\-changes were passed, and non\-conflicting
[email protected]@ -10237,15 +10209,15 @@
[email protected]@ -10729,15 +10701,15 @@
  print the patches already applied:
  .sp
  .nf
@@ -7318,7 +7553,7 @@
  .TP
  .B \-1,  \-\-last
  .
[email protected]@ -10254,15 +10226,15 @@
[email protected]@ -10746,15 +10718,15 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -7337,7 +7572,7 @@
  .fi
  .sp
  If source is local, destination will have no patches applied. If
[email protected]@ -10275,12 +10247,12 @@
[email protected]@ -10767,12 +10739,12 @@
  default. Use \-p <url> to change.
  .sp
  The patch directory must be a nested Mercurial repository, as
@@ -7352,7 +7587,7 @@
  .TP
  .B \-\-pull
  .
[email protected]@ -10309,21 +10281,21 @@
[email protected]@ -10801,21 +10773,21 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -7379,7 +7614,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -10372,23 +10344,23 @@
[email protected]@ -10868,23 +10840,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -7410,7 +7645,7 @@
  .fi
  .sp
  The patches must not be applied, and at least one patch is required. Exact
[email protected]@ -10396,10 +10368,10 @@
[email protected]@ -10892,10 +10864,10 @@
  preserved in the patch directory.
  .sp
  To stop managing a patch and move it into permanent history,
@@ -7423,7 +7658,7 @@
  .TP
  .B \-k,  \-\-keep
  .
[email protected]@ -10408,23 +10380,23 @@
[email protected]@ -10904,23 +10876,23 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  stop managing a revision (DEPRECATED)
@@ -7454,7 +7689,7 @@
  .fi
  .sp
  Shows a diff which includes the current patch as well as any
[email protected]@ -10432,8 +10404,8 @@
[email protected]@ -10928,8 +10900,8 @@
  last refresh (thus showing what the current patch would become
  after a qrefresh).
  .sp
@@ -7465,7 +7700,7 @@
  made by the current patch without including changes made since the
  qrefresh.
  .sp
[email protected]@ -10440,7 +10412,7 @@
[email protected]@ -10936,7 +10908,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7474,7 +7709,7 @@
  .TP
  .B \-a,  \-\-text
  .
[email protected]@ -10489,7 +10461,7 @@
[email protected]@ -10993,7 +10965,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7483,7 +7718,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qfinish
[email protected]@ -10497,9 +10469,9 @@
[email protected]@ -11001,9 +10973,9 @@
  move applied patches into repository history:
  .sp
  .nf
@@ -7495,7 +7730,7 @@
  .fi
  .sp
  Finishes the specified revisions (corresponding to applied
[email protected]@ -10518,20 +10490,20 @@
[email protected]@ -11022,20 +10994,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7520,7 +7755,7 @@
  .fi
  .sp
  Patches must not yet be applied. Each patch will be successively
[email protected]@ -10547,7 +10519,7 @@
[email protected]@ -11051,7 +11023,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7529,7 +7764,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -10564,21 +10536,21 @@
[email protected]@ -11068,21 +11040,21 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -7555,7 +7790,7 @@
  .TP
  .B \-\-keep\-changes
  .
[email protected]@ -10591,21 +10563,21 @@
[email protected]@ -11095,21 +11067,21 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -7582,7 +7817,7 @@
  has activated it.
  .sp
  With no arguments, print the currently active guards.
[email protected]@ -10612,21 +10584,21 @@
[email protected]@ -11116,21 +11088,21 @@
  With arguments, set guards for the named patch.
  .IP Note
  .
@@ -7608,7 +7843,7 @@
  .TP
  .B \-l,  \-\-list
  .
[email protected]@ -10635,15 +10607,15 @@
[email protected]@ -11139,15 +11111,15 @@
  .B \-n,  \-\-none
  .
  drop all guards
@@ -7627,7 +7862,7 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -10652,9 +10624,9 @@
[email protected]@ -11156,9 +11128,9 @@
  import a patch or existing changeset:
  .sp
  .nf
@@ -7639,7 +7874,7 @@
  .fi
  .sp
  The patch is inserted into the series after the last applied
[email protected]@ -10675,7 +10647,7 @@
[email protected]@ -11179,7 +11151,7 @@
  under mq control). With \-g/\-\-git, patches imported with \-\-rev will
  use the git diff format. See the diffs help topic for information
  on why this is important for preserving rename/copy information
@@ -7648,7 +7883,7 @@
  from mq control.
  .sp
  To import a patch from standard input, pass \- as the patch file.
[email protected]@ -10685,15 +10657,15 @@
[email protected]@ -11189,15 +11161,15 @@
  To import an existing patch while renaming it:
  .sp
  .nf
@@ -7667,7 +7902,7 @@
  .TP
  .B \-e,  \-\-existing
  .
[email protected]@ -10718,7 +10690,7 @@
[email protected]@ -11222,7 +11194,7 @@
  .B \-P,  \-\-push
  .
  qpush after importing
@@ -7676,7 +7911,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qinit
[email protected]@ -10726,9 +10698,9 @@
[email protected]@ -11230,9 +11202,9 @@
  init a new queue repository (DEPRECATED):
  .sp
  .nf
@@ -7688,7 +7923,7 @@
  .fi
  .sp
  The queue repository is unversioned by default. If
[email protected]@ -10737,24 +10709,24 @@
[email protected]@ -11241,24 +11213,24 @@
  an unversioned patch repository into a versioned one). You can use
  qcommit to commit changes to this queue repository.
  .sp
@@ -7719,7 +7954,7 @@
  .fi
  .sp
  qnew creates a new patch on top of the currently\-applied patch (if
[email protected]@ -10770,7 +10742,7 @@
[email protected]@ -11274,7 +11246,7 @@
  .sp
  \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
  well as the commit message. If none is specified, the header is
@@ -7728,7 +7963,7 @@
  .sp
  Use the \-g/\-\-git option to keep the patch in the git extended diff
  format. Read the diffs help topic for more information on why this
[email protected]@ -10780,7 +10752,7 @@
[email protected]@ -11284,7 +11256,7 @@
  Returns 0 on successful creation of a new patch.
  .sp
  Options:
@@ -7737,7 +7972,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -10825,7 +10797,7 @@
[email protected]@ -11329,7 +11301,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -7746,7 +7981,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qnext
[email protected]@ -10833,28 +10805,28 @@
[email protected]@ -11337,28 +11309,28 @@
  print the name of the next pushable patch:
  .sp
  .nf
@@ -7781,7 +8016,7 @@
  .fi
  .sp
  Without argument, pops off the top of the patch stack. If given a
[email protected]@ -10869,7 +10841,7 @@
[email protected]@ -11373,7 +11345,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -7790,7 +8025,7 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -10890,34 +10862,34 @@
[email protected]@ -11394,34 +11366,34 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -7832,7 +8067,7 @@
  .fi
  .sp
  By default, abort if the working directory contains uncommitted
[email protected]@ -10928,7 +10900,7 @@
[email protected]@ -11432,7 +11404,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -7841,7 +8076,7 @@
  .TP
  .B \-\-keep\-changes
  .
[email protected]@ -10965,15 +10937,15 @@
[email protected]@ -11469,15 +11441,15 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -7860,7 +8095,7 @@
  .fi
  .sp
  Supports switching between different patch queues, as well as creating
[email protected]@ -10995,7 +10967,7 @@
[email protected]@ -11499,7 +11471,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7869,7 +8104,7 @@
  .TP
  .B \-l,  \-\-list
  .
[email protected]@ -11020,15 +10992,15 @@
[email protected]@ -11524,15 +11496,15 @@
  .B \-\-purge
  .
  delete queue, and remove patch dir
@@ -7888,7 +8123,7 @@
  .fi
  .sp
  If any file patterns are provided, the refreshed patch will
[email protected]@ -11050,7 +11022,7 @@
[email protected]@ -11554,7 +11526,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7897,7 +8132,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -11095,7 +11067,7 @@
[email protected]@ -11599,7 +11571,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -7906,7 +8141,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qrename
[email protected]@ -11103,9 +11075,9 @@
[email protected]@ -11607,9 +11579,9 @@
  rename a patch:
  .sp
  .nf
@@ -7918,7 +8153,7 @@
  .fi
  .sp
  With one argument, renames the current patch to PATCH1.
[email protected]@ -11112,26 +11084,26 @@
[email protected]@ -11616,26 +11588,26 @@
  With two arguments, renames PATCH1 to PATCH2.
  .sp
  Returns 0 on success.
@@ -7953,7 +8188,7 @@
  .TP
  .B \-d,  \-\-delete
  .
[email protected]@ -11140,21 +11112,21 @@
[email protected]@ -11644,21 +11616,21 @@
  .B \-u,  \-\-update
  .
  update queue working directory
@@ -7980,7 +8215,7 @@
  .TP
  .B \-c,  \-\-copy
  .
[email protected]@ -11179,18 +11151,18 @@
[email protected]@ -11683,18 +11655,18 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -8003,7 +8238,7 @@
  qselect to tell mq which guards to use. A patch will be pushed if
  it has no guards or any positive guards match the currently
  selected guard, but will not be pushed if any negative guards
[email protected]@ -11197,11 +11169,11 @@
[email protected]@ -11701,11 +11673,11 @@
  match the current guard. For example:
  .sp
  .nf
@@ -8017,7 +8252,7 @@
  .fi
  .sp
  This activates the "stable" guard. mq will skip foo.patch (because
[email protected]@ -11227,7 +11199,7 @@
[email protected]@ -11731,7 +11703,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8026,7 +8261,7 @@
  .TP
  .B \-n,  \-\-none
  .
[email protected]@ -11244,21 +11216,21 @@
[email protected]@ -11748,21 +11720,21 @@
  .B \-\-reapply
  .
  pop, then reapply patches
@@ -8052,7 +8287,7 @@
  .TP
  .B \-m,  \-\-missing
  .
[email protected]@ -11267,40 +11239,40 @@
[email protected]@ -11771,40 +11743,40 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -8101,7 +8336,7 @@
  .TP
  .B \-1,  \-\-first
  .
[email protected]@ -11309,7 +11281,7 @@
[email protected]@ -11813,7 +11785,7 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -8110,7 +8345,7 @@
  .SS notify
  .sp
  hooks for sending email push notifications
[email protected]@ -11317,13 +11289,13 @@
[email protected]@ -11821,13 +11793,13 @@
  This extension implements hooks to send email notifications when
  changesets are sent from or received by the local repository.
  .sp
@@ -8126,7 +8361,7 @@
  [hooks]
  # one email for each incoming changeset
  incoming.notify = python:hgext.notify.hook
[email protected]@ -11332,7 +11304,7 @@
[email protected]@ -11836,7 +11808,7 @@
  
  # one email for all outgoing changesets
  outgoing.notify = python:hgext.notify.hook
@@ -8135,7 +8370,7 @@
  .fi
  .sp
  This registers the hooks. To enable notification, subscribers must
[email protected]@ -11341,7 +11313,7 @@
[email protected]@ -11845,7 +11817,7 @@
  multiple recipients to a single repository:
  .sp
  .nf
@@ -8144,7 +8379,7 @@
  [usersubs]
  # key is subscriber email, value is a comma\-separated list of repo patterns
  [email protected] = pattern
[email protected]@ -11349,7 +11321,7 @@
[email protected]@ -11853,7 +11825,7 @@
  [reposubs]
  # key is repo pattern, value is a comma\-separated list of subscriber emails
  pattern = [email protected]
@@ -8153,7 +8388,7 @@
  .fi
  .sp
  A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
[email protected]@ -11357,10 +11329,10 @@
[email protected]@ -11861,10 +11833,10 @@
  present, is separated from the glob by a hash. Example:
  .sp
  .nf
@@ -8166,7 +8401,7 @@
  .fi
  .sp
  This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
[email protected]@ -11371,10 +11343,10 @@
[email protected]@ -11875,10 +11847,10 @@
  incorporated by reference:
  .sp
  .nf
@@ -8179,7 +8414,7 @@
  .fi
  .sp
  Notifications will not be sent until the \fBnotify.test\fP value is set
[email protected]@ -11381,7 +11353,7 @@
[email protected]@ -11885,7 +11857,7 @@
  to \fBFalse\fP; see below.
  .sp
  Notifications content can be tweaked with the following configuration entries:
@@ -8188,7 +8423,7 @@
  .TP
  .B notify.test
  .
[email protected]@ -11390,8 +11362,8 @@
[email protected]@ -11894,8 +11866,8 @@
  .B notify.sources
  .
  Space\-separated list of change sources. Notifications are activated only
@@ -8199,7 +8434,7 @@
  .TP
  .B \fBserve\fP
  .sp
[email protected]@ -11412,7 +11384,7 @@
[email protected]@ -11916,7 +11888,7 @@
  .B \fBbundle\fP
  .sp
  changesets sent via \fBhg unbundle\fP
@@ -8208,7 +8443,7 @@
  .sp
  Default: serve.
  .TP
[email protected]@ -11455,7 +11427,7 @@
[email protected]@ -11959,7 +11931,7 @@
  .TP
  .B notify.maxsubject
  .
@@ -8217,7 +8452,7 @@
  .TP
  .B notify.diffstat
  .
[email protected]@ -11474,11 +11446,11 @@
[email protected]@ -11978,11 +11950,11 @@
  If set, use the committer of the first changeset in a changegroup for
  the "From" field of the notification mail. If not set, take the user
  from the pushing repo.  Default: False.
@@ -8231,7 +8466,7 @@
  .TP
  .B email.from
  .
[email protected]@ -11489,7 +11461,7 @@
[email protected]@ -11993,7 +11965,7 @@
  .
  Root repository URL to combine with repository paths when making
  references. See also \fBnotify.strip\fP.
@@ -8240,7 +8475,7 @@
  .SS pager
  .sp
  browse command output with an external pager
[email protected]@ -11497,10 +11469,10 @@
[email protected]@ -12001,10 +11973,10 @@
  To set the pager that should be used, set the application variable:
  .sp
  .nf
@@ -8253,7 +8488,7 @@
  .fi
  .sp
  If no pager is set, the pager extensions uses the environment variable
[email protected]@ -11510,10 +11482,10 @@
[email protected]@ -12014,10 +11986,10 @@
  pager.ignore list:
  .sp
  .nf
@@ -8266,7 +8501,7 @@
  .fi
  .sp
  You can also enable the pager only for certain commands using
[email protected]@ -11520,10 +11492,10 @@
[email protected]@ -12024,10 +11996,10 @@
  pager.attend. Below is the default list of commands to be paged:
  .sp
  .nf
@@ -8279,7 +8514,7 @@
  .fi
  .sp
  Setting pager.attend to an empty value will cause all commands to be
[email protected]@ -11536,13 +11508,13 @@
[email protected]@ -12040,13 +12012,13 @@
  existing attend and ignore options and defaults:
  .sp
  .nf
@@ -8296,7 +8531,7 @@
  to specify them in your user configuration file.
  .sp
  The \-\-pager=... option can also be used to control when the pager is
[email protected]@ -11558,7 +11530,7 @@
[email protected]@ -12062,7 +12034,7 @@
  Each patch email has a Subject line of "[PATCH M of N] ...", using the
  first line of the changeset description as the subject text. The
  message contains two or three body parts:
@@ -8305,7 +8540,7 @@
  .IP \(bu 2
  .
  The changeset description.
[email protected]@ -11567,8 +11539,8 @@
[email protected]@ -12071,8 +12043,8 @@
  [Optional] The result of running diffstat on the patch.
  .IP \(bu 2
  .
@@ -8316,7 +8551,7 @@
  .sp
  Each message refers to the first in the series using the In\-Reply\-To
  and References headers, so they will show up as a sequence in threaded
[email protected]@ -11578,7 +11550,7 @@
[email protected]@ -12082,7 +12054,7 @@
  configuration file:
  .sp
  .nf
@@ -8325,7 +8560,7 @@
  [email]
  from = My Name <[email protected]>
  to = recipient1, recipient2, ...
[email protected]@ -11585,13 +11557,13 @@
[email protected]@ -12089,13 +12061,13 @@
  cc = cc1, cc2, ...
  bcc = bcc1, bcc2, ...
  reply\-to = address1, address2, ...
@@ -8341,7 +8576,22 @@
  changesets as a patchbomb.
  .sp
  You can also either configure the method option in the email section
[email protected]@ -11605,13 +11577,13 @@
[email protected]@ -12109,12 +12081,12 @@
+ overwritten by command line flags like \-\-intro and \-\-desc:
+ .sp
+ .nf
+-.ft C
++.ft
+ [patchbomb]
+ intro=auto   # include introduction message if more than 1 patch (default)
+ intro=never  # never include an introduction message
+ intro=always # always include an introduction message
+-.ft P
++.ft
+ .fi
+ .sp
+ You can set patchbomb to always ask for confirmation by setting
[email protected]@ -12125,13 +12097,13 @@
  send changesets by email:
  .sp
  .nf
@@ -8358,7 +8608,7 @@
  of N]" introduction, which describes the series as a whole.
  .sp
  Each patch email has a Subject line of "[PATCH M of N] ...", using
[email protected]@ -11622,7 +11594,7 @@
[email protected]@ -12142,7 +12114,7 @@
  With the \-d/\-\-diffstat option, if the diffstat program is
  installed, the result of running diffstat on the patch is inserted.
  .sp
@@ -8367,7 +8617,13 @@
  .sp
  With the \-d/\-\-diffstat or \-\-confirm options, you will be presented
  with a final summary of all messages and asked for confirmation before
[email protected]@ -11662,7 +11634,7 @@
[email protected]@ -12180,12 +12152,12 @@
+ introductory message in \fB.hg/last\-email.txt\fP.
+ .sp
+ The default behavior of this command can be customized through
+-configuration. (See \%\fBhg help patchbomb\fP\: for details)
++configuration. (See \fBhg help patchbomb\fP for details)
+ .sp
  Examples:
  .sp
  .nf
@@ -8376,7 +8632,7 @@
  hg email \-r 3000          # send patch 3000 only
  hg email \-r 3000 \-r 3001  # send patches 3000 and 3001
  hg email \-r 3000:3005     # send patches 3000 through 3005
[email protected]@ -11683,7 +11655,7 @@
[email protected]@ -12206,7 +12178,7 @@
  hg email \-o \-m mbox &&    # generate an mbox file ...
    formail \-s sendmail \e   # ... and use formail to send from the mbox
      \-bm \-t < mbox         # ... using sendmail
@@ -8385,7 +8641,7 @@
  .fi
  .sp
  Before using this command, you will need to enable email in your
[email protected]@ -11690,7 +11662,7 @@
[email protected]@ -12213,7 +12185,7 @@
  hgrc. See the [email] section in hgrc(5) for details.
  .sp
  Options:
@@ -8394,7 +8650,7 @@
  .TP
  .B \-g,  \-\-git
  .
[email protected]@ -11807,7 +11779,7 @@
[email protected]@ -12330,7 +12302,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -8403,7 +8659,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS progress
[email protected]@ -11822,7 +11794,7 @@
[email protected]@ -12345,7 +12317,7 @@
  The following settings are available:
  .sp
  .nf
@@ -8412,7 +8668,7 @@
  [progress]
  delay = 3 # number of seconds (float) before showing the progress bar
  changedelay = 1 # changedelay: minimum delay before showing a new topic.
[email protected]@ -11832,11 +11804,11 @@
[email protected]@ -12355,11 +12327,11 @@
  format = topic bar number estimate # format of the progress bar
  width = <none> # if set, the maximum width of the progress information
                 # (that is, min(width, term width) will be used)
@@ -8427,7 +8683,7 @@
  .fi
  .sp
  Valid entries for the format field are topic, bar, number, unit,
[email protected]@ -11853,9 +11825,9 @@
[email protected]@ -12376,9 +12348,9 @@
  removes files not tracked by Mercurial:
  .sp
  .nf
@@ -8439,7 +8695,7 @@
  .fi
  .sp
  Delete files not known to Mercurial. This is useful to test local
[email protected]@ -11862,18 +11834,18 @@
[email protected]@ -12385,18 +12357,18 @@
  and uncommitted changes in an otherwise\-clean source tree.
  .sp
  This means that purge will delete the following by default:
@@ -8462,7 +8718,7 @@
  .IP \(bu 2
  .
  Modified and unmodified tracked files
[email protected]@ -11882,8 +11854,8 @@
[email protected]@ -12405,8 +12377,8 @@
  Ignored files (unless \-\-all is specified)
  .IP \(bu 2
  .
@@ -8473,7 +8729,7 @@
  .sp
  The \-\-files and \-\-dirs options can be used to direct purge to delete
  only files, only directories, or both. If neither option is given,
[email protected]@ -11898,7 +11870,7 @@
[email protected]@ -12421,7 +12393,7 @@
  option.
  .sp
  Options:
@@ -8482,7 +8738,7 @@
  .TP
  .B \-a,  \-\-abort\-on\-err
  .
[email protected]@ -11931,15 +11903,15 @@
[email protected]@ -12454,15 +12426,15 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8503,7 +8759,7 @@
  .SS rebase
  .sp
  command to move sets of revisions to a different ancestor
[email protected]@ -11948,7 +11920,7 @@
[email protected]@ -12471,7 +12443,7 @@
  repository.
  .sp
  For more information:
@@ -8512,7 +8768,7 @@
  .SS Commands
  .SS rebase
  .sp
[email protected]@ -11955,9 +11927,9 @@
[email protected]@ -12478,9 +12450,9 @@
  move changeset (and descendants) to a different branch:
  .sp
  .nf
@@ -8524,7 +8780,7 @@
  .fi
  .sp
  Rebase uses repeated merging to graft changesets from one part of
[email protected]@ -11971,9 +11943,9 @@
[email protected]@ -12494,9 +12466,9 @@
  pulling in your rebased changesets.
  .sp
  In its default configuration, Mercurial will prevent you from
@@ -8536,7 +8792,7 @@
  rebase uses the current branch tip as the destination. (The
  destination changeset is not modified by rebasing, but new
  changesets are added as its descendants.)
[email protected]@ -12005,7 +11977,7 @@
[email protected]@ -12528,7 +12500,7 @@
  and source branch is that, unlike \fBmerge\fP, rebase will do
  nothing if you are at the branch tip of a named branch
  with two heads. You need to explicitly specify source and/or
@@ -8545,7 +8801,7 @@
  the intended source branch).
  .sp
  If a rebase is interrupted to manually resolve a merge, it can be
[email protected]@ -12012,7 +11984,7 @@
[email protected]@ -12535,7 +12507,7 @@
  continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
  .sp
  Examples:
@@ -8554,7 +8810,7 @@
  .IP \(bu 2
  .
  move "local changes" (current commit back to branching point)
[email protected]@ -12019,9 +11991,9 @@
[email protected]@ -12542,9 +12514,9 @@
  to the current branch tip after a pull:
  .sp
  .nf
@@ -8566,7 +8822,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -12028,9 +12000,9 @@
[email protected]@ -12551,9 +12523,9 @@
  move a single changeset to the stable branch:
  .sp
  .nf
@@ -8578,7 +8834,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -12037,9 +12009,9 @@
[email protected]@ -12560,9 +12532,9 @@
  splice a commit and all its descendants onto another part of history:
  .sp
  .nf
@@ -8590,7 +8846,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -12047,9 +12019,9 @@
[email protected]@ -12570,9 +12542,9 @@
  default branch:
  .sp
  .nf
@@ -8602,7 +8858,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -12056,9 +12028,9 @@
[email protected]@ -12579,9 +12551,9 @@
  collapse a sequence of changes into a single commit:
  .sp
  .nf
@@ -8614,7 +8870,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -12065,17 +12037,17 @@
[email protected]@ -12588,17 +12560,17 @@
  move a named branch while preserving its name:
  .sp
  .nf
@@ -8636,7 +8892,7 @@
  .TP
  .BI \-s,  \-\-source \ <REV>
  .
[email protected]@ -12144,7 +12116,7 @@
[email protected]@ -12667,7 +12639,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -8645,7 +8901,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS record
[email protected]@ -12156,12 +12128,12 @@
[email protected]@ -12679,12 +12651,12 @@
  interactively record a new patch:
  .sp
  .nf
@@ -8661,7 +8917,7 @@
  usage.
  .SS record
  .sp
[email protected]@ -12168,15 +12140,15 @@
[email protected]@ -12691,15 +12663,15 @@
  interactively select changes to commit:
  .sp
  .nf
@@ -8681,7 +8937,7 @@
  .sp
  You will be prompted for whether to record changes to each
  modified file, and for files with multiple changes, for each
[email protected]@ -12184,7 +12156,7 @@
[email protected]@ -12707,7 +12679,7 @@
  possible:
  .sp
  .nf
@@ -8690,7 +8946,7 @@
  y \- record this change
  n \- skip this change
  e \- edit this change manually
[email protected]@ -12197,13 +12169,13 @@
[email protected]@ -12720,13 +12692,13 @@
  q \- quit, recording no changes
  
  ? \- display help
@@ -8706,7 +8962,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -12264,7 +12236,7 @@
[email protected]@ -12787,7 +12759,7 @@
  .B \-B,  \-\-ignore\-blank\-lines
  .
  ignore changes whose lines are all blank
@@ -8715,7 +8971,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS relink
[email protected]@ -12276,9 +12248,9 @@
[email protected]@ -12799,9 +12771,9 @@
  recreate hardlinks between two repositories:
  .sp
  .nf
@@ -8727,7 +8983,7 @@
  .fi
  .sp
  When repositories are cloned locally, their data files will be
[email protected]@ -12310,18 +12282,18 @@
[email protected]@ -12833,18 +12805,18 @@
  lot of repositories to act like a scheme, for example:
  .sp
  .nf
@@ -8750,7 +9006,7 @@
  .fi
  .sp
  Additionally there is support for some more complex schemas, for
[email protected]@ -12328,10 +12300,10 @@
[email protected]@ -12851,10 +12823,10 @@
  example used by Google Code:
  .sp
  .nf
@@ -8763,7 +9019,7 @@
  .fi
  .sp
  The syntax is taken from Mercurial templates, and you have unlimited
[email protected]@ -12343,7 +12315,7 @@
[email protected]@ -12866,7 +12838,7 @@
  For convenience, the extension adds these schemes by default:
  .sp
  .nf
@@ -8772,7 +9028,7 @@
  [schemes]
  py = http://hg.python.org/
  bb = https://bitbucket.org/
[email protected]@ -12350,7 +12322,7 @@
[email protected]@ -12873,7 +12845,7 @@
  bb+ssh = ssh://[email protected]/
  gcode = https://{1}.googlecode.com/hg/
  kiln = https://{1}.kilnhg.com/Repo/
@@ -8781,19 +9037,19 @@
  .fi
  .sp
  You can override a predefined scheme by defining a new scheme with the
[email protected]@ -12364,9 +12336,9 @@
[email protected]@ -12887,9 +12859,9 @@
  create a new shared repository:
  .sp
  .nf
 -.ft C
 +.ft
- hg share [\-U] SOURCE [DEST]
+ hg share [\-U] [\-B] SOURCE [DEST]
 -.ft P
 +.ft
  .fi
  .sp
  Initialize a new repository and working directory that shares its
[email protected]@ -12384,20 +12356,20 @@
[email protected]@ -12907,7 +12879,7 @@
  .RE
  .sp
  Options:
@@ -8802,7 +9058,10 @@
  .TP
  .B \-U,  \-\-noupdate
  .
- do not create a working copy
[email protected]@ -12916,15 +12888,15 @@
+ .B \-B,  \-\-bookmarks
+ .
+ also share bookmarks
 -.UNINDENT
 +.RE
  .SS unshare
@@ -8818,7 +9077,7 @@
  .fi
  .sp
  Copy the store data to the repo and remove the sharedpath data.
[email protected]@ -12411,7 +12383,7 @@
[email protected]@ -12938,7 +12910,7 @@
  .sp
  Later on, the "hg unshelve" command restores the changes saved by "hg
  shelve". Changes can be restored even after updating to a different
@@ -8827,7 +9086,7 @@
  conflicts if necessary.
  .sp
  You can have more than one shelved change outstanding at a time; each
[email protected]@ -12423,9 +12395,9 @@
[email protected]@ -12950,9 +12922,9 @@
  save and set aside changes from the working directory:
  .sp
  .nf
@@ -8839,7 +9098,7 @@
  .fi
  .sp
  Shelving takes files that "hg status" reports as not clean, saves
[email protected]@ -12453,7 +12425,7 @@
[email protected]@ -12980,7 +12952,7 @@
  all shelved changes, use \fB\-\-cleanup\fP.
  .sp
  Options:
@@ -8848,7 +9107,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -12502,7 +12474,7 @@
[email protected]@ -13033,7 +13005,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8857,7 +9116,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS unshelve
[email protected]@ -12510,9 +12482,9 @@
[email protected]@ -13041,9 +13013,9 @@
  restore a shelved change to the working directory:
  .sp
  .nf
@@ -8869,7 +9128,7 @@
  .fi
  .sp
  This command accepts an optional name of a shelved change to
[email protected]@ -12533,7 +12505,7 @@
[email protected]@ -13064,7 +13036,7 @@
  does not delete the bundle.)
  .sp
  Options:
@@ -8878,7 +9137,7 @@
  .TP
  .B \-a,  \-\-abort
  .
[email protected]@ -12550,7 +12522,7 @@
[email protected]@ -13081,7 +13053,7 @@
  .BI \-\-date \ <DATE>
  .
  set date for temporary commits (DEPRECATED)
@@ -8886,8 +9145,8 @@
 +.RE
  .SS strip
  .sp
- strip changesets and their descendents from history
[email protected]@ -12563,9 +12535,9 @@
+ strip changesets and their descendants from history
[email protected]@ -13094,9 +13066,9 @@
  strip changesets and all their descendants from the repository:
  .sp
  .nf
@@ -8899,7 +9158,7 @@
  .fi
  .sp
  The strip command removes the specified changesets and all their
[email protected]@ -12579,8 +12551,8 @@
[email protected]@ -13110,8 +13082,8 @@
  completes.
  .sp
  Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
@@ -8910,7 +9169,7 @@
  where BUNDLE is the bundle file created by the strip. Note that
  the local revision numbers will in general be different after the
  restore.
[email protected]@ -12595,7 +12567,7 @@
[email protected]@ -13126,7 +13098,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -8919,7 +9178,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -12624,7 +12596,7 @@
[email protected]@ -13155,7 +13127,7 @@
  .BI \-B,  \-\-bookmark \ <VALUE>
  .
  remove revs only reachable from given bookmark
@@ -8928,7 +9187,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS transplant
[email protected]@ -12632,7 +12604,7 @@
[email protected]@ -13163,7 +13135,7 @@
  command to transplant changesets from another branch
  .sp
  This extension allows you to transplant changes to another parent revision,
@@ -8937,7 +9196,7 @@
  .sp
  Transplanted patches are recorded in .hg/transplant/transplants, as a
  map from a changeset hash to its hash in the source repository.
[email protected]@ -12642,9 +12614,9 @@
[email protected]@ -13173,9 +13145,9 @@
  transplant changesets from another branch:
  .sp
  .nf
@@ -8949,7 +9208,7 @@
  .fi
  .sp
  Selected changesets will be applied on top of the current working
[email protected]@ -12661,9 +12633,9 @@
[email protected]@ -13192,9 +13164,9 @@
  of the form:
  .sp
  .nf
@@ -8961,7 +9220,7 @@
  .fi
  .sp
  You can rewrite the changelog message with the \-\-filter option.
[email protected]@ -12679,17 +12651,17 @@
[email protected]@ -13210,17 +13182,17 @@
  with \-\-branch will be transplanted.
  .sp
  Example:
@@ -8983,7 +9242,7 @@
  .sp
  You can optionally mark selected transplanted changesets as merge
  changesets. You will not be prompted to transplant any ancestors
[email protected]@ -12697,17 +12669,17 @@
[email protected]@ -13228,17 +13200,17 @@
  normally instead of transplanting them.
  .sp
  Merge changesets may be transplanted directly by specifying the
@@ -9006,7 +9265,7 @@
  .TP
  .BI \-s,  \-\-source \ <REPO>
  .
[email protected]@ -12748,7 +12720,7 @@
[email protected]@ -13279,7 +13251,7 @@
  .BI \-\-filter \ <CMD>
  .
  filter changesets through command
@@ -9015,7 +9274,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS win32mbcs
[email protected]@ -12763,7 +12735,7 @@
[email protected]@ -13294,7 +13266,7 @@
  operation.
  .sp
  This extension is useful for:
@@ -9024,7 +9283,7 @@
  .IP \(bu 2
  .
  Japanese Windows users using shift_jis encoding.
[email protected]@ -12774,10 +12746,10 @@
[email protected]@ -13305,10 +13277,10 @@
  .
  All users who use a repository with one of problematic encodings on
  case\-insensitive file system.
@@ -9037,7 +9296,7 @@
  .IP \(bu 2
  .
  Any user who use only ASCII chars in path.
[email protected]@ -12784,10 +12756,10 @@
[email protected]@ -13315,10 +13287,10 @@
  .IP \(bu 2
  .
  Any user who do not use any of problematic encodings.
@@ -9050,7 +9309,7 @@
  .IP \(bu 2
  .
  You should use single encoding in one repository.
[email protected]@ -12797,16 +12769,16 @@
[email protected]@ -13328,16 +13300,16 @@
  .IP \(bu 2
  .
  win32mbcs is not compatible with fixutf8 extension.
@@ -9070,7 +9329,7 @@
  .fi
  .sp
  It is useful for the users who want to commit with UTF\-8 log message.
[email protected]@ -12813,8 +12785,8 @@
[email protected]@ -13344,8 +13316,8 @@
  .SS win32text
  .sp
  perform automatic newline conversion (DEPRECATED)
@@ -9081,7 +9340,7 @@
  .sp
  Deprecation: The win32text extension requires each user to configure
  the extension again and again for each clone since the configuration
[email protected]@ -12823,13 +12795,13 @@
[email protected]@ -13354,13 +13326,13 @@
  We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
  uses a version controlled file for its configuration and each clone
  will therefore use the right settings from the start.
@@ -9098,7 +9357,7 @@
  [extensions]
  win32text =
  [encode]
[email protected]@ -12839,17 +12811,17 @@
[email protected]@ -13370,17 +13342,17 @@
  [decode]
  ** = cleverdecode:
  # or ** = macdecode:
@@ -9119,7 +9378,7 @@
  .fi
  .sp
  To do the same check on a server to prevent CRLF/CR from being
[email protected]@ -12856,11 +12828,11 @@
[email protected]@ -13387,11 +13359,11 @@
  pushed or pulled:
  .sp
  .nf
@@ -9133,7 +9392,7 @@
  .fi
  .SS zeroconf
  .sp
[email protected]@ -12871,33 +12843,33 @@
[email protected]@ -13402,33 +13374,33 @@
  without knowing their actual IP address.
  .sp
  To allow other people to discover your repository using run
@@ -9176,7 +9435,7 @@
  files.
  .TP
  .B \fB.hgignore\fP
[email protected]@ -12904,13 +12876,13 @@
[email protected]@ -13435,13 +13407,13 @@
  .sp
  This file contains regular expressions (one per line) that
  describe file names that should be ignored by \fBhg\fP. For details,
@@ -9192,7 +9451,7 @@
  .TP
  .B \fB.hgsubstate\fP
  .sp
[email protected]@ -12925,7 +12897,7 @@
[email protected]@ -13456,7 +13428,7 @@
  .TP
  .B \fB.hg/last\-message.txt\fP
  .sp
@@ -9201,7 +9460,7 @@
  in case the commit fails.
  .TP
  .B \fB.hg/localtags\fP
[email protected]@ -12933,28 +12905,34 @@
[email protected]@ -13464,28 +13436,34 @@
  This file can be used to define local tags which are not shared among
  repositories. The file format is the same as for \fB.hgtags\fP, but it is
  encoded using the local system encoding.
@@ -9242,9 +9501,9 @@
 +Mailing list: http://selenic.com/mailman/listinfo/mercurial
  .SH COPYING
  .sp
- Copyright (C) 2005\-2014 Matt Mackall.
---- mercurial-3.2.3/doc/hgignore.5.orig	Thu Dec 18 12:59:33 2014
-+++ mercurial-3.2.3/doc/hgignore.5	Thu Dec 18 18:23:25 2014
+ Copyright (C) 2005\-2015 Matt Mackall.
+--- mercurial-3.4/doc/hgignore.5.orig	Fri May  1 14:49:19 2015
++++ mercurial-3.4/doc/hgignore.5	Mon May  4 14:57:28 2015
 @@ -3,33 +3,6 @@
  .TH HGIGNORE 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -9365,8 +9624,8 @@
  .SH COPYING
  .sp
  This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-3.2.3/doc/hgrc.5.orig	Thu Dec 18 12:59:33 2014
-+++ mercurial-3.2.3/doc/hgrc.5	Thu Dec 18 18:23:29 2014
+--- mercurial-3.4/doc/hgrc.5.orig	Fri May  1 14:49:20 2015
++++ mercurial-3.4/doc/hgrc.5	Mon May  4 14:57:32 2015
 @@ -3,33 +3,6 @@
  .TH HGRC 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -9436,10 +9695,10 @@
  .IP \(bu 2
  .
  \fB<repo>/.hg/hgrc\fP (per\-repository)
[email protected]@ -84,77 +56,21 @@
- .IP \(bu 2
- .
- \fB/etc/mercurial/hgrc.d/*.rc\fP (per\-system)
[email protected]@ -87,79 +59,18 @@
+ .IP \(bu 2
+ .
+ \fB<internal>/default.d/*.rc\fP (defaults)
 -.UNINDENT
 -.sp
 -On Windows, the following files are consulted:
@@ -9468,6 +9727,9 @@
 -.IP \(bu 2
 -.
 -\fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP (per\-installation)
+-.IP \(bu 2
+-.
+-\fB<internal>/default.d/*.rc\fP (defaults)
 -.UNINDENT
 -.IP Note
 -.
@@ -9495,37 +9757,42 @@
 -.IP \(bu 2
 -.
 -\fB/lib/mercurial/hgrc.d/*.rc\fP (per\-system)
--.UNINDENT
-+Per\-repository configuration options only apply in a particular
-+repository.  This file is not version\-controlled, and will not get
-+transferred during a "clone" operation. Options in this file override
-+options in all other configuration files.  Most of this file will be
-+ignored if it doesn't belong to a trusted user or to a trusted group.
-+See the documentation for the \fB[trusted]\fP section below for more
-+details.
- .sp
--Per\-repository configuration options only apply in a
--particular repository. This file is not version\-controlled, and
--will not get transferred during a "clone" operation. Options in
+-.IP \(bu 2
+-.
+-\fB<internal>/default.d/*.rc\fP (defaults)
+-.UNINDENT
+-.sp
+ Per\-repository configuration options only apply in a
+ particular repository. This file is not version\-controlled, and
+ will not get transferred during a "clone" operation. Options in
 -this file override options in all other configuration files. On
 -Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
--belong to a trusted user or to a trusted group. See the documentation
--for the \fB[trusted]\fP section below for more details.
-+Per\-user configuration file(s) are for the user running Mercurial.
-+Options in these files apply to all Mercurial commands executed by
-+this user in any directory. Options in these files override per\-system
-+and per\-installation options.
++this file override options in all other configuration files.
++Most of this file will be ignored if it doesn't
+ belong to a trusted user or to a trusted group. See the documentation
+ for the \fB[trusted]\fP section below for more details.
  .sp
 -Per\-user configuration file(s) are for the user running Mercurial. On
 -Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
--files apply to all Mercurial commands executed by this user in any
--directory. Options in these files override per\-system and per\-installation
--options.
--.sp
- Per\-installation configuration files are searched for in the
- directory where Mercurial is installed. \fB<install\-root>\fP is the
- parent directory of the \fBhg\fP executable (or symlink) being run. For
[email protected]@ -181,12 +97,12 @@
++Per\-user configuration file(s) are for the user running Mercurial.
++Options in these
+ files apply to all Mercurial commands executed by this user in any
+ directory. Options in these files override per\-system and per\-installation
+ options.
[email protected]@ -173,10 +84,8 @@
+ .sp
+ Per\-installation configuration files are for the system on
+ which Mercurial is running. Options in these files apply to all
+-Mercurial commands executed by any user in any directory. Registry
+-keys contain PATH\-like strings, every part of which must reference
+-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
+-be read.  Mercurial checks each of these locations in the specified
++Mercurial commands executed by any user in any directory.
++Mercurial checks each of these locations in the specified
+ order until one or more configuration files are detected.
+ .sp
+ Per\-system configuration files are for the system on which Mercurial
[email protected]@ -197,12 +106,12 @@
  \fBconfiguration keys\fP):
  .sp
  .nf
@@ -9540,7 +9807,7 @@
  .fi
  .sp
  Each line contains one entry. If the lines that follow are indented,
[email protected]@ -198,12 +114,12 @@
[email protected]@ -214,12 +123,12 @@
  will use the value that was configured last. As an example:
  .sp
  .nf
@@ -9555,7 +9822,7 @@
  .fi
  .sp
  This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
[email protected]@ -213,7 +129,7 @@
[email protected]@ -229,7 +138,7 @@
  example:
  .sp
  .nf
@@ -9564,7 +9831,7 @@
  [foo]
  eggs=large
  ham=serrano
[email protected]@ -228,7 +144,7 @@
[email protected]@ -244,7 +153,7 @@
  ham=prosciutto
  eggs=medium
  bread=toasted
@@ -9573,7 +9840,7 @@
  .fi
  .sp
  This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
[email protected]@ -250,9 +166,9 @@
[email protected]@ -266,9 +175,9 @@
  \fBfile\fP. This lets you do something like:
  .sp
  .nf
@@ -9585,7 +9852,7 @@
  .fi
  .sp
  to include a different configuration file on each computer you use.
[email protected]@ -269,9 +185,9 @@
[email protected]@ -285,9 +194,9 @@
  placed in double quotation marks:
  .sp
  .nf
@@ -9597,7 +9864,7 @@
  .fi
  .sp
  Quotation marks can be escaped by prefixing them with a backslash. Only
[email protected]@ -295,17 +211,17 @@
[email protected]@ -311,17 +220,17 @@
  Alias definitions consist of lines of the form:
  .sp
  .nf
@@ -9619,7 +9886,7 @@
  .fi
  .sp
  creates a new command \fBlatest\fP that shows only the five most recent
[email protected]@ -312,9 +228,9 @@
[email protected]@ -328,9 +237,9 @@
  changesets. You can define subsequent aliases using earlier ones:
  .sp
  .nf
@@ -9631,7 +9898,7 @@
  .fi
  .IP Note
  .
[email protected]@ -328,9 +244,9 @@
[email protected]@ -344,9 +253,9 @@
  run arbitrary commands. As an example,
  .sp
  .nf
@@ -9643,7 +9910,7 @@
  .fi
  .sp
  will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
[email protected]@ -337,9 +253,9 @@
[email protected]@ -353,9 +262,9 @@
  terminal. A better example might be:
  .sp
  .nf
@@ -9655,7 +9922,7 @@
  .fi
  .sp
  which will make \fBhg purge\fP delete all unknown files in the
[email protected]@ -369,7 +285,7 @@
[email protected]@ -385,7 +294,7 @@
  Settings used when displaying file annotations. All values are
  Booleans and default to False. See \fBdiff\fP section for related
  options for the diff command.
@@ -9664,7 +9931,7 @@
  .TP
  .B \fBignorews\fP
  .sp
[email protected]@ -382,7 +298,7 @@
[email protected]@ -398,7 +307,7 @@
  .B \fBignoreblanklines\fP
  .sp
  Ignore changes whose lines are all blank.
@@ -9673,7 +9940,7 @@
  .SS \fBauth\fP
  .sp
  Authentication credentials for HTTP authentication. This section
[email protected]@ -393,9 +309,9 @@
[email protected]@ -409,9 +318,9 @@
  Each line has the following format:
  .sp
  .nf
@@ -9685,7 +9952,7 @@
  .fi
  .sp
  where \fB<name>\fP is used to group arguments into authentication
[email protected]@ -402,7 +318,7 @@
[email protected]@ -418,7 +327,7 @@
  entries. Example:
  .sp
  .nf
@@ -9694,7 +9961,7 @@
  foo.prefix = hg.intevation.org/mercurial
  foo.username = foo
  foo.password = bar
[email protected]@ -412,11 +328,11 @@
[email protected]@ -428,11 +337,11 @@
  bar.key = path/to/file.key
  bar.cert = path/to/file.cert
  bar.schemes = https
@@ -9708,7 +9975,7 @@
  .TP
  .B \fBprefix\fP
  .sp
[email protected]@ -423,7 +339,7 @@
[email protected]@ -439,7 +348,7 @@
  Either \fB*\fP or a URI prefix with or without the scheme part.
  The authentication entry with the longest matching prefix is used
  (where \fB*\fP matches everything and counts as a match of length
@@ -9717,7 +9984,7 @@
  against the URI with its scheme stripped as well, and the schemes
  argument, q.v., is then subsequently consulted.
  .TP
[email protected]@ -455,11 +371,11 @@
[email protected]@ -471,11 +380,11 @@
  .B \fBschemes\fP
  .sp
  Optional. Space separated list of URI schemes to use this
@@ -9731,7 +9998,7 @@
  .sp
  If no suitable authentication entry is found, the user is prompted
  for credentials as usual if required by the remote.
[email protected]@ -470,176 +386,176 @@
[email protected]@ -486,176 +395,176 @@
  .sp
  In addition to pre\-defined template keywords, commit log specific one
  below can be used for customization:
@@ -9964,7 +10231,7 @@
  .sp
  At the external editor invocation for committing, corresponding
  dot\-separated list of names without \fBchangeset.\fP prefix
[email protected]@ -650,7 +566,7 @@
[email protected]@ -666,7 +575,7 @@
  below can be referred as \fB{listupfiles}\fP:
  .sp
  .nf
@@ -9973,7 +10240,7 @@
  [committemplate]
  listupfiles = {file_adds %
     "HG: added {file}\en"     }{file_mods %
[email protected]@ -657,7 +573,7 @@
[email protected]@ -673,7 +582,7 @@
     "HG: changed {file}\en"   }{file_dels %
     "HG: removed {file}\en"   }{if(files, "",
     "HG: no files changed\en")}
@@ -9982,7 +10249,7 @@
  .fi
  .SS \fBdecode/encode\fP
  .sp
[email protected]@ -681,7 +597,7 @@
[email protected]@ -697,7 +606,7 @@
  Pipe example:
  .sp
  .nf
@@ -9991,7 +10258,7 @@
  [encode]
  # uncompress gzip files on checkin to improve delta compression
  # note: not necessarily a good idea, just an example
[email protected]@ -689,9 +605,9 @@
[email protected]@ -705,9 +614,9 @@
  
  [decode]
  # recompress gzip files when writing them to the working dir (we
@@ -10003,7 +10270,7 @@
  .fi
  .sp
  A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
[email protected]@ -699,12 +615,6 @@
[email protected]@ -715,12 +624,6 @@
  filtered by the command. The string \fBOUTFILE\fP is replaced with the name
  of an empty temporary file, where the filtered data must be written by
  the command.
@@ -10016,7 +10283,7 @@
  .sp
  This filter mechanism is used internally by the \fBeol\fP extension to
  translate line ending characters between Windows (CRLF) and Unix (LF)
[email protected]@ -711,20 +621,20 @@
[email protected]@ -727,20 +630,20 @@
  format. We suggest you use the \fBeol\fP extension for convenience.
  .SS \fBdefaults\fP
  .sp
@@ -10042,7 +10309,7 @@
  .fi
  .sp
  The actual commands, instead of their aliases, must be used when
[email protected]@ -735,7 +645,7 @@
[email protected]@ -751,7 +654,7 @@
  Settings used when displaying diffs. Everything except for \fBunified\fP
  is a Boolean and defaults to False. See \fBannotate\fP section for
  related options for the annotate command.
@@ -10051,16 +10318,21 @@
  .TP
  .B \fBgit\fP
  .sp
[email protected]@ -747,7 +657,7 @@
[email protected]@ -763,11 +666,11 @@
  .TP
  .B \fBnodates\fP
  .sp
 -Don\(aqt include dates in diff headers.
 +Don't include dates in diff headers.
  .TP
+ .B \fBnoprefix\fP
+ .sp
+-Omit \(aqa/\(aq and \(aqb/\(aq prefixes from filenames. Ignored in plain mode.
++Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
+ .TP
  .B \fBshowfunc\fP
  .sp
[email protected]@ -768,11 +678,11 @@
[email protected]@ -788,11 +691,11 @@
  .B \fBunified\fP
  .sp
  Number of lines of context to show.
@@ -10074,7 +10346,7 @@
  .TP
  .B \fBfrom\fP
  .sp
[email protected]@ -781,16 +691,16 @@
[email protected]@ -801,16 +704,16 @@
  .TP
  .B \fBto\fP
  .sp
@@ -10094,7 +10366,7 @@
  email addresses.
  .TP
  .B \fBmethod\fP
[email protected]@ -813,7 +723,7 @@
[email protected]@ -833,7 +736,7 @@
  empty (explicit) list.
  .sp
  Order of outgoing email character sets:
@@ -10103,7 +10375,7 @@
  .IP 1. 3
  .
  \fBus\-ascii\fP: always first, regardless of settings
[email protected]@ -829,13 +739,13 @@
[email protected]@ -849,13 +752,13 @@
  .IP 5. 3
  .
  \fButf\-8\fP: always last, regardless of settings
@@ -10120,7 +10392,7 @@
  [email]
  from = Joseph User <[email protected]>
  method = /usr/sbin/sendmail
[email protected]@ -842,7 +752,7 @@
[email protected]@ -862,7 +765,7 @@
  # charsets for western Europeans
  # us\-ascii, utf\-8 omitted, as they are tried first and last
  charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
@@ -10129,7 +10401,7 @@
  .fi
  .SS \fBextensions\fP
  .sp
[email protected]@ -849,7 +759,7 @@
[email protected]@ -869,7 +772,7 @@
  Mercurial has an extension mechanism for adding new features. To
  enable an extension, create an entry for it in this section.
  .sp
@@ -10138,7 +10410,7 @@
  you can give the name of the module, followed by \fB=\fP, with nothing
  after the \fB=\fP.
  .sp
[email protected]@ -864,16 +774,16 @@
[email protected]@ -884,16 +787,16 @@
  Example for \fB~/.hgrc\fP:
  .sp
  .nf
@@ -10159,7 +10431,7 @@
  .TP
  .B \fBusestore\fP
  .sp
[email protected]@ -901,7 +811,7 @@
[email protected]@ -921,7 +824,7 @@
  Mac OS X and spaces on Windows. Enabled by default. Disabling this
  option ensures that the on\-disk format of newly created
  repositories will be compatible with Mercurial before version 1.7.
@@ -10168,7 +10440,7 @@
  .SS \fBgraph\fP
  .sp
  Web graph view configuration. This section let you change graph
[email protected]@ -911,9 +821,9 @@
[email protected]@ -931,9 +834,9 @@
  Each line has the following format:
  .sp
  .nf
@@ -10180,7 +10452,7 @@
  .fi
  .sp
  where \fB<branch>\fP is the name of the branch being
[email protected]@ -920,17 +830,17 @@
[email protected]@ -940,17 +843,17 @@
  customized. Example:
  .sp
  .nf
@@ -10201,7 +10473,7 @@
  .TP
  .B \fBwidth\fP
  .sp
[email protected]@ -939,7 +849,7 @@
[email protected]@ -959,7 +862,7 @@
  .B \fBcolor\fP
  .sp
  Set branch edges color in hexadecimal RGB notation.
@@ -10210,7 +10482,7 @@
  .SS \fBhooks\fP
  .sp
  Commands or Python functions that get automatically executed by
[email protected]@ -954,7 +864,7 @@
[email protected]@ -974,7 +877,7 @@
  Example \fB.hg/hgrc\fP:
  .sp
  .nf
@@ -10219,7 +10491,7 @@
  [hooks]
  # update working directory after adding changesets
  changegroup.update = hg update
[email protected]@ -964,13 +874,13 @@
[email protected]@ -984,13 +887,13 @@
  incoming.autobuild = /my/build/hook
  # force autobuild hook to run before other incoming hooks
  priority.incoming.autobuild = 1
@@ -10235,7 +10507,7 @@
  .TP
  .B \fBchangegroup\fP
  .sp
[email protected]@ -1014,7 +924,7 @@
[email protected]@ -1034,7 +937,7 @@
  representations of the data internally passed to <command>. \fB$HG_OPTS\fP
  is a  dictionary of options (with unspecified options set to their
  defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
@@ -10244,7 +10516,7 @@
  code.
  .TP
  .B \fBprechangegroup\fP
[email protected]@ -1114,7 +1024,7 @@
[email protected]@ -1167,7 +1070,7 @@
  new parent is in \fB$HG_PARENT1\fP. If merge, ID of second new parent is
  in \fB$HG_PARENT2\fP. If the update succeeded, \fB$HG_ERROR=0\fP. If the
  update failed (e.g. because conflicts not resolved), \fB$HG_ERROR=1\fP.
@@ -10253,7 +10525,7 @@
  .IP Note
  .
  It is generally better to use standard hooks rather than the
[email protected]@ -1123,21 +1033,14 @@
[email protected]@ -1176,21 +1079,14 @@
  Also, hooks like "commit" will be called in all contexts that
  generate a commit (e.g. tag) and not just the commit command.
  .RE
@@ -10277,7 +10549,7 @@
  .fi
  .sp
  Python hooks are run within the Mercurial process. Each hook is
[email protected]@ -1161,10 +1064,10 @@
[email protected]@ -1214,10 +1110,10 @@
  For example:
  .sp
  .nf
@@ -10290,7 +10562,7 @@
  .fi
  .sp
  This feature is only supported when using Python 2.6 or later.
[email protected]@ -1172,7 +1075,7 @@
[email protected]@ -1225,7 +1121,7 @@
  .sp
  Used to access web\-based Mercurial repositories through a HTTP
  proxy.
@@ -10299,7 +10571,7 @@
  .TP
  .B \fBhost\fP
  .sp
[email protected]@ -1196,7 +1099,7 @@
[email protected]@ -1249,7 +1145,7 @@
  .sp
  Optional. Always use the proxy, even for localhost and any entries
  in \fBhttp_proxy.no\fP. True or False. Default: False.
@@ -10308,7 +10580,7 @@
  .SS \fBmerge\-patterns\fP
  .sp
  This section specifies merge tools to associate with particular file
[email protected]@ -1207,23 +1110,23 @@
[email protected]@ -1260,23 +1156,23 @@
  Example:
  .sp
  .nf
@@ -10337,7 +10609,7 @@
  [merge\-tools]
  # Override stock tool location
  kdiff3.executable = ~/bin/kdiff3
[email protected]@ -1237,13 +1140,12 @@
[email protected]@ -1290,13 +1186,12 @@
  
  # Define new tool
  myHtmlTool.args = \-m $local $other $base $output
@@ -10353,7 +10625,7 @@
  .TP
  .B \fBpriority\fP
  .sp
[email protected]@ -1252,9 +1154,7 @@
[email protected]@ -1305,9 +1200,7 @@
  .TP
  .B \fBexecutable\fP
  .sp
@@ -10364,7 +10636,7 @@
  .TP
  .B \fBargs\fP
  .sp
[email protected]@ -1276,7 +1176,7 @@
[email protected]@ -1329,7 +1222,7 @@
  \fBkeep\-merge3\fP. The \fBkeep\fP option will leave markers in the file if the
  premerge fails. The \fBkeep\-merge3\fP will do the same but include information
  about the base of the merge in the marker (see internal :merge3 in
@@ -10373,7 +10645,7 @@
  Default: True
  .TP
  .B \fBbinary\fP
[email protected]@ -1292,7 +1192,7 @@
[email protected]@ -1345,7 +1238,7 @@
  .B \fBcheck\fP
  .sp
  A list of merge success\-checking options:
@@ -10382,7 +10654,7 @@
  .TP
  .B \fBchanged\fP
  .sp
[email protected]@ -1305,7 +1205,7 @@
[email protected]@ -1358,7 +1251,7 @@
  .B \fBprompt\fP
  .sp
  Always prompt for merge success, regardless of success reported by tool.
@@ -10391,7 +10663,7 @@
  .TP
  .B \fBfixeol\fP
  .sp
[email protected]@ -1315,42 +1215,16 @@
[email protected]@ -1368,42 +1261,16 @@
  .B \fBgui\fP
  .sp
  This tool requires a graphical interface to run. Default: False
@@ -10438,7 +10710,7 @@
  are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
  lines are ignored when patching and the result line endings are
  normalized to either LF (Unix) or CRLF (Windows). When set to
[email protected]@ -1359,7 +1233,7 @@
[email protected]@ -1412,7 +1279,7 @@
  on a per\-file basis. If target file does not exist or has no end
  of line, patch line endings are preserved.
  Default: strict.
@@ -10447,7 +10719,7 @@
  .SS \fBpaths\fP
  .sp
  Assigns symbolic names to repositories. The left side is the
[email protected]@ -1366,7 +1240,7 @@
[email protected]@ -1419,7 +1286,7 @@
  symbolic name, and the right gives the directory or URL that is the
  location of the repository. Default paths can be declared by setting
  the following entries.
@@ -10456,7 +10728,7 @@
  .TP
  .B \fBdefault\fP
  .sp
[email protected]@ -1378,30 +1252,30 @@
[email protected]@ -1431,30 +1298,30 @@
  .sp
  Optional. Directory or URL to use when pushing if no destination
  is specified.
@@ -10494,7 +10766,7 @@
  .TP
  .B \fBpublish\fP
  .sp
[email protected]@ -1426,7 +1300,7 @@
[email protected]@ -1479,7 +1346,7 @@
  either aborted (if checksubrepos is set to "abort") or the higher phase is
  used for the parent repository commit (if set to "follow").
  Default: "follow"
@@ -10503,7 +10775,7 @@
  .SS \fBprofiling\fP
  .sp
  Specifies profiling type, format, and file output. Two profilers are
[email protected]@ -1433,21 +1307,21 @@
[email protected]@ -1486,21 +1353,21 @@
  supported: an instrumenting profiler (named \fBls\fP), and a sampling
  profiler (named \fBstat\fP).
  .sp
@@ -10530,7 +10802,7 @@
  works on all platforms, but each line number it reports is the
  first line of a function. This restriction makes it difficult to
  identify the expensive parts of a non\-trivial function.
[email protected]@ -1457,13 +1331,13 @@
[email protected]@ -1510,13 +1377,13 @@
  Use a third\-party statistical profiler, statprof. This profiler
  currently runs only on Unix systems, and is most useful for
  profiling commands that run for longer than about 0.1 seconds.
@@ -10546,7 +10818,7 @@
  .TP
  .B \fBtext\fP
  .sp
[email protected]@ -1476,7 +1350,7 @@
[email protected]@ -1529,7 +1396,7 @@
  Format profiling data for kcachegrind use: when saving to a
  file, the generated file can directly be loaded into
  kcachegrind.
@@ -10555,7 +10827,7 @@
  .TP
  .B \fBfrequency\fP
  .sp
[email protected]@ -1507,14 +1381,14 @@
[email protected]@ -1560,14 +1427,14 @@
  This can help explain the difference between Total and Inline.
  Specific to the \fBls\fP instrumenting profiler.
  Default: 5.
@@ -10573,7 +10845,7 @@
  .TP
  .B \fBuncompressed\fP
  .sp
[email protected]@ -1539,11 +1413,11 @@
[email protected]@ -1592,11 +1459,11 @@
  Whether to validate the completeness of pushed changesets by
  checking that all new file revisions specified in manifests are
  present. Default is False.
@@ -10587,7 +10859,7 @@
  .TP
  .B \fBhost\fP
  .sp
[email protected]@ -1568,7 +1442,7 @@
[email protected]@ -1621,7 +1488,7 @@
  \fB[web] cacerts\fP also). For "strict", sending email is also
  aborted, if there is no configuration for mail server in
  \fB[hostfingerprints]\fP and \fB[web] cacerts\fP.  \-\-insecure for
@@ -10596,7 +10868,7 @@
  .TP
  .B \fBusername\fP
  .sp
[email protected]@ -1583,9 +1457,9 @@
[email protected]@ -1636,9 +1503,9 @@
  .TP
  .B \fBlocal_hostname\fP
  .sp
@@ -10608,7 +10880,7 @@
  .SS \fBsubpaths\fP
  .sp
  Subrepository source URLs can go stale if a remote server changes name
[email protected]@ -1593,9 +1467,9 @@
[email protected]@ -1646,9 +1513,9 @@
  rewrite rules of the form:
  .sp
  .nf
@@ -10620,7 +10892,7 @@
  .fi
  .sp
  where \fBpattern\fP is a regular expression matching a subrepository
[email protected]@ -1604,9 +1478,9 @@
[email protected]@ -1657,9 +1524,9 @@
  \fBreplacements\fP. For instance:
  .sp
  .nf
@@ -10632,7 +10904,7 @@
  .fi
  .sp
  rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
[email protected]@ -1617,7 +1491,7 @@
[email protected]@ -1670,7 +1537,7 @@
  .SS \fBtrusted\fP
  .sp
  Mercurial will not use the settings in the
@@ -10641,7 +10913,7 @@
  user or to a trusted group, as various hgrc features allow arbitrary
  commands to be run. This issue is often encountered when configuring
  hooks or extensions for shared repositories or servers. However,
[email protected]@ -1629,7 +1503,7 @@
[email protected]@ -1682,7 +1549,7 @@
  group with name \fB*\fP. These settings must be placed in an
  \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
  user or service running Mercurial.
@@ -10650,7 +10922,7 @@
  .TP
  .B \fBusers\fP
  .sp
[email protected]@ -1638,17 +1512,17 @@
[email protected]@ -1691,17 +1558,17 @@
  .B \fBgroups\fP
  .sp
  Comma\-separated list of trusted groups.
@@ -10671,7 +10943,7 @@
  Default is True.
  .TP
  .B \fBaskusername\fP
[email protected]@ -1676,7 +1550,7 @@
[email protected]@ -1729,7 +1596,7 @@
  .TP
  .B \fBfallbackencoding\fP
  .sp
@@ -10680,7 +10952,7 @@
  UTF\-8. Default is ISO\-8859\-1.
  .TP
  .B \fBignore\fP
[email protected]@ -1699,7 +1573,7 @@
[email protected]@ -1752,7 +1619,7 @@
  .B \fBmerge\fP
  .sp
  The conflict resolution program to use during a manual merge.
@@ -10689,7 +10961,7 @@
  For configuring merge tools see the \fB[merge\-tools]\fP section.
  .TP
  .B \fBmergemarkers\fP
[email protected]@ -1706,7 +1580,7 @@
[email protected]@ -1759,7 +1626,7 @@
  .sp
  Sets the merge conflict marker label styling. The \fBdetailed\fP
  style uses the \fBmergemarkertemplate\fP setting to style the labels.
@@ -10698,7 +10970,7 @@
  One of \fBbasic\fP or \fBdetailed\fP.
  Default is \fBbasic\fP.
  .TP
[email protected]@ -1713,7 +1587,7 @@
[email protected]@ -1766,7 +1633,7 @@
  .B \fBmergemarkertemplate\fP
  .sp
  The template used to print the commit description next to each conflict
@@ -10707,7 +10979,7 @@
  format.
  Defaults to showing the hash, tags, branches, bookmarks, author, and
  the first line of the commit description.
[email protected]@ -1731,7 +1605,7 @@
[email protected]@ -1784,7 +1651,7 @@
  Default is \fBwarn\fP.
  If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX
  platforms, if a file with a non\-portable filename is added (e.g. a file
@@ -10716,7 +10988,7 @@
  parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case
  collision with an existing file).
  If set to \fBignore\fP (or \fBfalse\fP), no warning is printed.
[email protected]@ -1792,7 +1666,7 @@
[email protected]@ -1849,7 +1716,7 @@
  .B \fBusername\fP
  .sp
  The committer of a changeset created when running "commit".
@@ -10725,7 +10997,7 @@
  <[email protected]>\fP. Default is \fB$EMAIL\fP or \[email protected]\fP. If
  the username in hgrc is empty, it has to be specified manually or
  in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set
[email protected]@ -1802,11 +1676,11 @@
[email protected]@ -1859,11 +1726,11 @@
  .B \fBverbose\fP
  .sp
  Increase the amount of output printed. True or False. Default is False.
@@ -10739,7 +11011,7 @@
  run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
  and WSGI).
  .sp
[email protected]@ -1822,9 +1696,9 @@
[email protected]@ -1879,9 +1746,9 @@
  command line:
  .sp
  .nf
@@ -10751,7 +11023,7 @@
  .fi
  .sp
  Note that this will allow anybody to push anything to the server and
[email protected]@ -1831,7 +1705,7 @@
[email protected]@ -1888,7 +1755,7 @@
  that this should not be used for public servers.
  .sp
  The full set of options is:
@@ -10760,7 +11032,7 @@
  .TP
  .B \fBaccesslog\fP
  .sp
[email protected]@ -1915,13 +1789,13 @@
[email protected]@ -1972,13 +1839,13 @@
  To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
  command line.
  .sp
@@ -10776,7 +11048,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
[email protected]@ -1928,7 +1802,7 @@
[email protected]@ -1985,7 +1852,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
@@ -10785,7 +11057,7 @@
  .fi
  .TP
  .B \fBcache\fP
[email protected]@ -1989,7 +1863,7 @@
[email protected]@ -2046,7 +1913,7 @@
  .TP
  .B \fBdescription\fP
  .sp
@@ -10794,7 +11066,7 @@
  Default is "unknown".
  .TP
  .B \fBencoding\fP
[email protected]@ -2054,7 +1928,7 @@
[email protected]@ -2111,7 +1978,7 @@
  .TP
  .B \fBprefix\fP
  .sp
@@ -10803,7 +11075,7 @@
  .TP
  .B \fBpush_ssl\fP
  .sp
[email protected]@ -2083,7 +1957,7 @@
[email protected]@ -2140,7 +2007,7 @@
  .sp
  Where to find the HTML templates. The default path to the HTML templates
  can be obtained from \fBhg debuginstall\fP.
@@ -10812,7 +11084,7 @@
  .SS \fBwebsub\fP
  .sp
  Web substitution filter definition. You can use this section to
[email protected]@ -2105,9 +1979,9 @@
[email protected]@ -2162,9 +2029,9 @@
  which in turn imitates the Unix sed replacement syntax:
  .sp
  .nf
@@ -10824,7 +11096,7 @@
  .fi
  .sp
  You can use any separator other than "/". The final "i" is optional
[email protected]@ -2116,12 +1990,12 @@
[email protected]@ -2173,12 +2040,12 @@
  Examples:
  .sp
  .nf
@@ -10839,7 +11111,7 @@
  .fi
  .SS \fBworker\fP
  .sp
[email protected]@ -2128,7 +2002,7 @@
[email protected]@ -2185,7 +2052,7 @@
  Parallel master/worker configuration. We currently perform working
  directory updates in parallel on Unix\-like systems, which greatly
  helps performance.
@@ -10848,7 +11120,7 @@
  .TP
  .B \fBnumcpus\fP
  .sp
[email protected]@ -2135,18 +2009,18 @@
[email protected]@ -2192,18 +2059,18 @@
  Number of CPUs to use for parallel operations. Default is 4 or the
  number of CPUs on the system, whichever is larger. A zero or
  negative value is treated as \fBuse the default\fP.
@@ -10869,6 +11141,6 @@
  .sp
 -This manual page is copyright 2005 Bryan O\(aqSullivan.
 +This manual page is copyright 2005 Bryan O'Sullivan.
- Mercurial is copyright 2005\-2014 Matt Mackall.
+ Mercurial is copyright 2005\-2015 Matt Mackall.
  Free use of this software is granted under the terms of the GNU General
  Public License version 2 or any later version.
--- a/components/mercurial/patches/rst.patch	Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/patches/rst.patch	Wed May 06 10:05:59 2015 -0700
@@ -36,8 +36,8 @@
  Some commands (e.g. revert) produce backup files ending in ``.orig``,
  if the ``.orig`` file already exists and is not tracked by Mercurial,
  it will be overwritten.
---- mercurial-3.2.3/mercurial/help/config.txt	Thu Dec 18 12:59:22 2014
-+++ mercurial-3.2.3/mercurial/help/config.txt	Thu Dec 18 18:19:37 2014
+--- mercurial-3.4/mercurial/help/config.txt	Fri May  1 14:48:51 2015
++++ mercurial-3.4/mercurial/help/config.txt	Mon May  4 14:54:54 2015
 @@ -18,8 +18,7 @@
  Mercurial reads configuration data from several files, if they exist.
  These files do not exist by default and you will have to create the
@@ -57,25 +57,14 @@
  
    - ``<repo>/.hg/hgrc`` (per-repository)
    - ``$HOME/.hgrc`` (per-user)
[email protected]@ -39,49 +38,19 @@
-   - ``/etc/mercurial/hgrc`` (per-system)
[email protected]@ -40,47 +39,16 @@
    - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
+   - ``<internal>/default.d/*.rc`` (defaults)
  
 -.. container:: verbose.windows
-+Per-repository configuration options only apply in a particular
-+repository.  This file is not version-controlled, and will not get
-+transferred during a "clone" operation. Options in this file override
-+options in all other configuration files.  Most of this file will be
-+ignored if it doesn't belong to a trusted user or to a trusted group.
-+See the documentation for the ``[trusted]`` section below for more
-+details.
- 
+-
 -  On Windows, the following files are consulted:
-+Per-user configuration file(s) are for the user running Mercurial.
-+Options in these files apply to all Mercurial commands executed by
-+this user in any directory. Options in these files override per-system
-+and per-installation options.
- 
+-
 -  - ``<repo>/.hg/hgrc`` (per-repository)
 -  - ``%USERPROFILE%\.hgrc`` (per-user)
 -  - ``%USERPROFILE%\Mercurial.ini`` (per-user)
@@ -84,6 +73,7 @@
 -  - ``<install-dir>\Mercurial.ini`` (per-installation)
 -  - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
 -  - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
+-  - ``<internal>/default.d/*.rc`` (defaults)
 -
 -  .. note::
 -
@@ -100,25 +90,39 @@
 -  - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
 -  - ``/lib/mercurial/hgrc`` (per-system)
 -  - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
+-  - ``<internal>/default.d/*.rc`` (defaults)
 -
--Per-repository configuration options only apply in a
--particular repository. This file is not version-controlled, and
--will not get transferred during a "clone" operation. Options in
+ Per-repository configuration options only apply in a
+ particular repository. This file is not version-controlled, and
+ will not get transferred during a "clone" operation. Options in
 -this file override options in all other configuration files. On
 -Plan 9 and Unix, most of this file will be ignored if it doesn't
--belong to a trusted user or to a trusted group. See the documentation
--for the ``[trusted]`` section below for more details.
--
++this file override options in all other configuration files.
++Most of this file will be ignored if it doesn't
+ belong to a trusted user or to a trusted group. See the documentation
+ for the ``[trusted]`` section below for more details.
+ 
 -Per-user configuration file(s) are for the user running Mercurial. On
 -Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these
--files apply to all Mercurial commands executed by this user in any
--directory. Options in these files override per-system and per-installation
--options.
--
- Per-installation configuration files are searched for in the
- directory where Mercurial is installed. ``<install-root>`` is the
- parent directory of the **hg** executable (or symlink) being run. For
[email protected]@ -490,12 +459,6 @@
++Per-user configuration file(s) are for the user running Mercurial.
++Options in these
+ files apply to all Mercurial commands executed by this user in any
+ directory. Options in these files override per-system and per-installation
+ options.
[email protected]@ -94,10 +62,8 @@
+ 
+ Per-installation configuration files are for the system on
+ which Mercurial is running. Options in these files apply to all
+-Mercurial commands executed by any user in any directory. Registry
+-keys contain PATH-like strings, every part of which must reference
+-a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
+-be read.  Mercurial checks each of these locations in the specified
++Mercurial commands executed by any user in any directory.
++Mercurial checks each of these locations in the specified
+ order until one or more configuration files are detected.
+ 
+ Per-system configuration files are for the system on which Mercurial
[email protected]@ -500,12 +466,6 @@
  of an empty temporary file, where the filtered data must be written by
  the command.
  
@@ -131,7 +135,7 @@
  This filter mechanism is used internally by the ``eol`` extension to
  translate line ending characters between Windows (CRLF) and Unix (LF)
  format. We suggest you use the ``eol`` extension for convenience.
[email protected]@ -849,13 +812,6 @@
[email protected]@ -891,13 +851,6 @@
     Also, hooks like "commit" will be called in all contexts that
     generate a commit (e.g. tag) and not just the commit command.
  
@@ -145,7 +149,7 @@
  The syntax for Python hooks is as follows::
  
    hookname = python:modulename.submodule.callable
[email protected]@ -951,7 +907,6 @@
[email protected]@ -993,7 +946,6 @@
  
    # Define new tool
    myHtmlTool.args = -m $local $other $base $output
@@ -153,7 +157,7 @@
    myHtmlTool.priority = 1
  
  Supported arguments:
[email protected]@ -961,9 +916,7 @@
[email protected]@ -1003,9 +955,7 @@
    Default: 0.
  
  ``executable``
@@ -164,7 +168,7 @@
  
  ``args``
    The arguments to pass to the tool executable. You can refer to the
[email protected]@ -1011,29 +964,6 @@
[email protected]@ -1053,29 +1003,6 @@
  ``gui``
    This tool requires a graphical interface to run. Default: False