Patchwork D9556: docs: avoid `hg diff -r` in documentation about revsets

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2020, 3:09 a.m.
Message ID <differential-rev-PHID-DREV-b4ou3vlrok7mkje25xkj-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47850/
State Superseded
Headers show

Comments

phabricator - Dec. 10, 2020, 3:09 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I don't think `hg diff -r a::b` is a good use case for revsets because
  it's not clear what it's supposed to do (as evidenced by the comment
  we had there to explain what it meant).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9556

AFFECTED FILES
  mercurial/helptext/revisions.txt
  tests/test-extension.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -987,15 +987,15 @@ 
   $ echo "multirevs = multirevs.py" >> $HGRCPATH
 
   $ hg help multirevs | tail
+  
+          hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
+  
+      - Update to the commit that bookmark @ is pointing to, without activating
+        the bookmark (this works because the last revision of the revset is
         used):
   
           hg update :@
   
-      - Show diff between tags 1.3 and 1.5 (this works because the first and the
-        last revisions of the revset are used):
-  
-          hg diff -r 1.3::1.5
-  
   use 'hg help -c multirevs' to see help for the multirevs command
 
 
diff --git a/mercurial/helptext/revisions.txt b/mercurial/helptext/revisions.txt
--- a/mercurial/helptext/revisions.txt
+++ b/mercurial/helptext/revisions.txt
@@ -216,8 +216,3 @@ 
   bookmark (this works because the last revision of the revset is used)::
 
     hg update :@
-
-- Show diff between tags 1.3 and 1.5 (this works because the first and the
-  last revisions of the revset are used)::
-
-    hg diff -r 1.3::1.5