[PATCH 2 of 2] Use note admonition
Erik Zielke
ez at aragost.com
Wed Sep 22 10:22:51 CDT 2010
# HG changeset patch
# User Erik Zielke <ez at aragost.com>
# Date 1285165435 -7200
# Node ID 79be802c97f053cb97aad8cecf1889d346c5d651
# Parent ded8e44b92bda9f6cb6b12c49e3d36b19c47e37d
Use note admonition
diff -r ded8e44b92bd -r 79be802c97f0 hgext/mq.py
--- 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::
diff -r ded8e44b92bd -r 79be802c97f0 hgext/share.py
--- 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,7 +14,7 @@
Initialize a new repository and working directory that shares its
history with another repository.
- NOTE: using rollback or extensions that destroy/modify history
+ .. 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
diff -r ded8e44b92bd -r 79be802c97f0 mercurial/commands.py
--- 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
diff -r ded8e44b92bd -r 79be802c97f0 tests/test-help.t
--- 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
More information about the Mercurial-devel
mailing list