Mercurial > hg

changeset 10659:19c0ff5606e1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: remove unnecessary \" from help string They are not needed inside triple-quoted strings and they confuse the line number computation done in i18n/hggettext. The script tries to find the docstring in the source file. When \" in the source is turned into just " in the docstring, the docstring can no longer be found.
author Martin Geisler <mg@lazybytes.net>
date Fri, 12 Mar 2010 00:45:27 +0100
parents 95c7c4b7e67a
children 24555e216af6 9602fc4e6914 664bb0ce95ed
files hgext/rebase.py
diffstat 1 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Mar 08 03:07:35 2010 +0100
+++ b/hgext/rebase.py	Fri Mar 12 00:45:27 2010 +0100
@@ -38,17 +38,16 @@
     rebasing, but new changesets are added as its descendants.)
 
     You can specify which changesets to rebase in two ways: as a
-    \"source\" changeset or as a \"base\" changeset. Both are
-    shorthand for a topologically related set of changesets (the
-    \"source branch\"). If you specify source (``-s/--source``),
-    rebase will rebase that changeset and all of its descendants onto
-    dest. If you specify base (``-b/--base``), rebase will select
-    ancestors of base back to but not including the common ancestor
-    with dest. Thus, ``-b`` is less precise but more convenient than
-    ``-s``: you can specify any changeset in the source branch, and
-    rebase will select the whole branch. If you specify neither ``-s``
-    nor ``-b``, rebase uses the parent of the working directory as the
-    base.
+    "source" changeset or as a "base" changeset. Both are shorthand
+    for a topologically related set of changesets (the "source
+    branch"). If you specify source (``-s/--source``), rebase will
+    rebase that changeset and all of its descendants onto dest. If you
+    specify base (``-b/--base``), rebase will select ancestors of base
+    back to but not including the common ancestor with dest. Thus,
+    ``-b`` is less precise but more convenient than ``-s``: you can
+    specify any changeset in the source branch, and rebase will select
+    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
+    uses the parent of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch
     as descendants of dest and then destroys the originals. Use