| Submitter | timeless@mozdev.org |
|---|---|
| Date | Dec. 18, 2015, 7:09 p.m. |
| Message ID | <20efc5315455ada3ad35.1450465763@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/12165/ |
| State | Accepted |
| Commit | fe79f86099aea04d2960c468eef3b0e902b02d0c |
| Headers | show |
Comments
On Fri, 18 Dec 2015 14:09:23 -0500, timeless <timeless@mozdev.org> wrote: > # HG changeset patch > # User timeless <timeless@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@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
On Mon, 2015-12-21 at 15:54 -0500, Matt Harbison wrote: > On Fri, 18 Dec 2015 14:09:23 -0500, timeless <timeless@mozdev.org> wrote: > > > # HG changeset patch > > # User timeless <timeless@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. Yep, I just spotted that. Amended to drop "[rfc]" from the summary.. but with a stray perf experiment in my working copy. Fix pushed. -- Mathematics is the supreme nostalgia of our time.
Patch
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.