Patchwork [4,of,6] annotate: mention that -n is suppressed in help

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 17, 2015, 8:31 p.m.
Message ID <45add854790554295446.1450384286@waste.org>
Download mbox | patch
Permalink /patch/12125/
State Superseded
Commit 9dcd55a63f0b8593888e290b6b1cbf9865f6a1ee
Headers show

Comments

timeless@mozdev.org - Dec. 17, 2015, 8:31 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450364174 0
#      Thu Dec 17 14:56:14 2015 +0000
# Node ID 45add8547905542954463690675133f79918a3c3
# Parent  1f41728f543a494617142a71f11668b69122f6b5
annotate: mention that -n is suppressed in help
Augie Fackler - Dec. 18, 2015, 4:34 p.m.
On Thu, Dec 17, 2015 at 02:31:26PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450364174 0
> #      Thu Dec 17 14:56:14 2015 +0000
> # Node ID 45add8547905542954463690675133f79918a3c3
> # Parent  1f41728f543a494617142a71f11668b69122f6b5
> annotate: mention that -n is suppressed in help
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -330,6 +330,10 @@
>      This command is useful for discovering when a change was made and
>      by whom.
>
> +    If you include -f/-u/-d, the revision number is suppressed unless
> +    you also include -the revision number is suppressed unless

should this be -the or just the?

> +    you also include -n.
> +
>      Without the -a/--text option, annotate will avoid processing files
>      it detects as binary. With -a, annotate will annotate the file
>      anyway, although the results will probably be neither useful
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
timeless - Dec. 18, 2015, 4:41 p.m.
just the, sorry.

On Fri, Dec 18, 2015 at 11:34 AM, Augie Fackler <raf@durin42.com> wrote:
> On Thu, Dec 17, 2015 at 02:31:26PM -0600, timeless wrote:
>> # HG changeset patch
>> # User timeless <timeless@mozdev.org>
>> # Date 1450364174 0
>> #      Thu Dec 17 14:56:14 2015 +0000
>> # Node ID 45add8547905542954463690675133f79918a3c3
>> # Parent  1f41728f543a494617142a71f11668b69122f6b5
>> annotate: mention that -n is suppressed in help
>>
>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>> --- a/mercurial/commands.py
>> +++ b/mercurial/commands.py
>> @@ -330,6 +330,10 @@
>>      This command is useful for discovering when a change was made and
>>      by whom.
>>
>> +    If you include -f/-u/-d, the revision number is suppressed unless
>> +    you also include -the revision number is suppressed unless
>
> should this be -the or just the?
>
>> +    you also include -n.
>> +
>>      Without the -a/--text option, annotate will avoid processing files
>>      it detects as binary. With -a, annotate will annotate the file
>>      anyway, although the results will probably be neither useful
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel
timeless - Dec. 18, 2015, 4:41 p.m.
err, no. that commit is corrupt.

On Fri, Dec 18, 2015 at 11:41 AM, timeless <timeless@gmail.com> wrote:
> just the, sorry.
>
> On Fri, Dec 18, 2015 at 11:34 AM, Augie Fackler <raf@durin42.com> wrote:
>> On Thu, Dec 17, 2015 at 02:31:26PM -0600, timeless wrote:
>>> # HG changeset patch
>>> # User timeless <timeless@mozdev.org>
>>> # Date 1450364174 0
>>> #      Thu Dec 17 14:56:14 2015 +0000
>>> # Node ID 45add8547905542954463690675133f79918a3c3
>>> # Parent  1f41728f543a494617142a71f11668b69122f6b5
>>> annotate: mention that -n is suppressed in help
>>>
>>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>>> --- a/mercurial/commands.py
>>> +++ b/mercurial/commands.py
>>> @@ -330,6 +330,10 @@
>>>      This command is useful for discovering when a change was made and
>>>      by whom.
>>>
>>> +    If you include -f/-u/-d, the revision number is suppressed unless
>>> +    you also include -the revision number is suppressed unless
>>
>> should this be -the or just the?
>>
>>> +    you also include -n.
>>> +
>>>      Without the -a/--text option, annotate will avoid processing files
>>>      it detects as binary. With -a, annotate will annotate the file
>>>      anyway, although the results will probably be neither useful
>>> _______________________________________________
>>> Mercurial-devel mailing list
>>> Mercurial-devel@selenic.com
>>> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -330,6 +330,10 @@ 
     This command is useful for discovering when a change was made and
     by whom.
 
+    If you include -f/-u/-d, the revision number is suppressed unless
+    you also include -the revision number is suppressed unless
+    you also include -n.
+
     Without the -a/--text option, annotate will avoid processing files
     it detects as binary. With -a, annotate will annotate the file
     anyway, although the results will probably be neither useful