[PATCH 1 of 2] commands: consistently indent notes 3 spaces [RFC]
Matt Harbison
mharbison72 at gmail.com
Mon Dec 21 14:54:13 CST 2015
On Fri, 18 Dec 2015 14:09:23 -0500, timeless <timeless at mozdev.org> wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1450420428 0
> # Fri Dec 18 06:33:48 2015 +0000
> # Node ID 20efc5315455ada3ad351c9c9d2283a1b1e7583c
> # Parent 2916ebaef3129451bfd4f9f62487e70f74124d46
> commands: consistently indent notes 3 spaces [RFC]
>
> most notes have 3 spaces for indentation, these had 2...
> anyone care?
This was queued as fe79f86099ae, but it looks like a few @util.nogc
annotations slipped in. Not sure if that was meant to be temporary for
other work, or really committed with something else.
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -541,8 +541,8 @@
> .. note::
> - backout cannot be used to fix either an unwanted or
> - incorrect merge.
> + backout cannot be used to fix either an unwanted or
> + incorrect merge.
> .. container:: verbose
> @@ -3821,8 +3821,8 @@
> .. note::
> - The -c/--continue option does not reapply earlier options, except
> - for --force.
> + The -c/--continue option does not reapply earlier options, except
> + for --force.
> .. container:: verbose
> @@ -5626,9 +5626,9 @@
> .. note::
> - Extra care should be taken with the -f/--force option,
> - which will push all new heads on all branches, an action which
> will
> - almost always cause confusion for collaborators.
> + Extra care should be taken with the -f/--force option,
> + which will push all new heads on all branches, an action which
> will
> + almost always cause confusion for collaborators.
> If -r/--rev is used, the specified revision and all its ancestors
> will be pushed to the remote repository.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list