--- a/hgext/mq.py Wed Sep 22 15:51:59 2010 +0200
+++ b/hgext/mq.py Wed Sep 22 16:23:55 2010 +0200
@@ -2174,7 +2174,9 @@
With no arguments, print the currently active guards.
With arguments, set guards for the named patch.
- NOTE: Specifying negative guards now requires '--'.
+
+ .. note::
+ Specifying negative guards now requires '--'.
To set guards on another patch::
--- a/hgext/share.py Wed Sep 22 15:51:59 2010 +0200
+++ b/hgext/share.py Wed Sep 22 16:23:55 2010 +0200
@@ -14,15 +14,16 @@
Initialize a new repository and working directory that shares its
history with another repository.
- NOTE: using rollback or extensions that destroy/modify history
- (mq, rebase, etc.) can cause considerable confusion with shared
- clones. In particular, if two shared clones are both updated to
- the same changeset, and one of them destroys that changeset with
- rollback, the other clone will suddenly stop working: all
- operations will fail with "abort: working directory has unknown
- parent". The only known workaround is to use debugsetparents on
- the broken clone to reset it to a changeset that still exists
- (e.g. tip).
+ .. note::
+ using rollback or extensions that destroy/modify history (mq,
+ rebase, etc.) can cause considerable confusion with shared
+ clones. In particular, if two shared clones are both updated to
+ the same changeset, and one of them destroys that changeset
+ with rollback, the other clone will suddenly stop working: all
+ operations will fail with "abort: working directory has unknown
+ parent". The only known workaround is to use debugsetparents on
+ the broken clone to reset it to a changeset that still exists
+ (e.g. tip).
"""
return hg.share(ui, source, dest, not noupdate)
--- a/mercurial/commands.py Wed Sep 22 15:51:59 2010 +0200
+++ b/mercurial/commands.py Wed Sep 22 16:23:55 2010 +0200
@@ -1432,9 +1432,10 @@
Differences between files are shown using the unified diff format.
- NOTE: diff may generate unexpected results for merges, as it will
- default to comparing against the working directory's first parent
- changeset if no revisions are specified.
+ .. note::
+ diff may generate unexpected results for merges, as it will
+ default to comparing against the working directory's first
+ parent changeset if no revisions are specified.
When two revision arguments are given, then changes are shown
between those revisions. If only one revision is specified then
--- a/tests/test-help.t Wed Sep 22 15:51:59 2010 +0200
+++ b/tests/test-help.t Wed Sep 22 16:23:55 2010 +0200
@@ -439,9 +439,10 @@
Differences between files are shown using the unified diff format.
- NOTE: diff may generate unexpected results for merges, as it will default
- to comparing against the working directory's first parent changeset if no
- revisions are specified.
+ Note:
+ diff may generate unexpected results for merges, as it will default to
+ comparing against the working directory's first parent changeset if no
+ revisions are specified.
When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is