Mercurial > hg
changeset 10660:24555e216af6
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 12 Mar 2010 00:50:41 +0100 |
| parents | 909a99b92f67 (current diff) 19c0ff5606e1 (diff) |
| children | c4859aad1980 |
| files | hgext/rebase.py |
| diffstat | 3 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Fri Mar 12 00:02:39 2010 +0100 +++ b/contrib/check-code.py Fri Mar 12 00:50:41 2010 +0100 @@ -52,6 +52,7 @@ (r'/bin/', "don't use explicit paths for tools"), (r'\$PWD', "don't use $PWD, use `pwd`"), (r'[^\n]\Z', "no trailing newline"), + (r'export.*=', "don't export and assign at once"), ] testfilters = [
--- a/hgext/rebase.py Fri Mar 12 00:02:39 2010 +0100 +++ b/hgext/rebase.py Fri Mar 12 00:50:41 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