[PATCH 6 of 8] documentation: add an extra newline after note directive

Simon Heimberg simohe at besonet.ch
Sat Nov 2 06:36:06 CDT 2013


# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1383388412 -3600
#      Sat Nov 02 11:33:32 2013 +0100
# Branch stable
# Node ID dbe30788f7d828caa6fd541dc5d4fe8083cb8137
# Parent  d30798f0059bb39d8b0325aba95a687596a252b0
documentation: add an extra newline after note directive

Like this no docutils version interprets any line in the following text as
argument of note.

diff -r d30798f0059b -r dbe30788f7d8 hgext/eol.py
--- a/hgext/eol.py	Sat Nov 02 11:25:52 2013 +0100
+++ b/hgext/eol.py	Sat Nov 02 11:33:32 2013 +0100
@@ -49,6 +49,7 @@
   native = LF
 
 .. note::
+
    The rules will first apply when files are touched in the working
    copy, e.g. by updating to null and back to tip to touch all files.
 
diff -r d30798f0059b -r dbe30788f7d8 hgext/keyword.py
--- a/hgext/keyword.py	Sat Nov 02 11:25:52 2013 +0100
+++ b/hgext/keyword.py	Sat Nov 02 11:33:32 2013 +0100
@@ -53,6 +53,7 @@
     svn = True
 
 .. note::
+
    The more specific you are in your filename patterns the less you
    lose speed in huge repositories.
 
diff -r d30798f0059b -r dbe30788f7d8 hgext/mq.py
--- a/hgext/mq.py	Sat Nov 02 11:25:52 2013 +0100
+++ b/hgext/mq.py	Sat Nov 02 11:33:32 2013 +0100
@@ -2622,6 +2622,7 @@
     With arguments, set guards for the named patch.
 
     .. note::
+
        Specifying negative guards now requires '--'.
 
     To set guards on another patch::
diff -r d30798f0059b -r dbe30788f7d8 hgext/share.py
--- a/hgext/share.py	Sat Nov 02 11:25:52 2013 +0100
+++ b/hgext/share.py	Sat Nov 02 11:33:32 2013 +0100
@@ -17,6 +17,7 @@
     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
diff -r d30798f0059b -r dbe30788f7d8 mercurial/commands.py
--- a/mercurial/commands.py	Sat Nov 02 11:25:52 2013 +0100
+++ b/mercurial/commands.py	Sat Nov 02 11:33:32 2013 +0100
@@ -397,6 +397,7 @@
     changes and the merged result is left uncommitted.
 
     .. note::
+
       backout cannot be used to fix either an unwanted or
       incorrect merge.
 
@@ -937,6 +938,7 @@
     """set or show the current branch name
 
     .. note::
+
        Branch names are permanent and global. Use :hg:`bookmark` to create a
        light-weight bookmark instead. See :hg:`help glossary` for more
        information about named branches and bookmarks.
@@ -2707,6 +2709,7 @@
     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.
@@ -2796,6 +2799,7 @@
     comment.
 
     .. note::
+
        export may generate unexpected diff output for merge
        changesets, as it will compare the merge changeset against its
        first parent only.
@@ -2928,6 +2932,7 @@
     continued with the -c/--continue option.
 
     .. note::
+
       The -c/--continue option does not reapply earlier options.
 
     .. container:: verbose
@@ -3979,12 +3984,14 @@
     changed files and full commit message are shown.
 
     .. note::
+
        log -p/--patch may generate unexpected diff output for merge
        changesets, as it will only compare the merge changeset against
        its first parent. Also, only files different from BOTH parents
        will appear in files:.
 
     .. note::
+
        for performance reasons, log FILE may omit duplicate changes
        made on branches and will not show deletions. To see all
        changes including duplicates and deletions, use the --removed
@@ -4976,6 +4983,7 @@
     """restore files to their checkout state
 
     .. note::
+
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes),
        use :hg:`update --clean .`.
@@ -5306,6 +5314,7 @@
     unless explicitly requested with -u/--unknown or -i/--ignored.
 
     .. note::
+
        status may appear to disagree with diff if permissions have
        changed or a merge has occurred. The standard diff format does
        not report permission changes and diff only reports changes


More information about the Mercurial-devel mailing list