Show More
@@ -822,7 +822,7 b' class rebaseruntime(object):' | |||||
822 | ( |
|
822 | ( | |
823 | b'b', |
|
823 | b'b', | |
824 | b'base', |
|
824 | b'base', | |
825 |
|
|
825 | [], | |
826 | _(b'rebase everything from branching point of specified changeset'), |
|
826 | _(b'rebase everything from branching point of specified changeset'), | |
827 | _(b'REV'), |
|
827 | _(b'REV'), | |
828 | ), |
|
828 | ), | |
@@ -871,7 +871,7 b' class rebaseruntime(object):' | |||||
871 | + cmdutil.dryrunopts |
|
871 | + cmdutil.dryrunopts | |
872 | + cmdutil.formatteropts |
|
872 | + cmdutil.formatteropts | |
873 | + cmdutil.confirmopts, |
|
873 | + cmdutil.confirmopts, | |
874 | _(b'[[-s REV]... | -b REV | [-r REV]...] [-d REV] [OPTION]...'), |
|
874 | _(b'[[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...'), | |
875 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
875 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, | |
876 | ) |
|
876 | ) | |
877 | def rebase(ui, repo, **opts): |
|
877 | def rebase(ui, repo, **opts): | |
@@ -1187,7 +1187,7 b' def _origrebase(' | |||||
1187 | inmemory, |
|
1187 | inmemory, | |
1188 | opts.get(b'dest', None), |
|
1188 | opts.get(b'dest', None), | |
1189 | opts.get(b'source', []), |
|
1189 | opts.get(b'source', []), | |
1190 |
opts.get(b'base', |
|
1190 | opts.get(b'base', []), | |
1191 | opts.get(b'rev', []), |
|
1191 | opts.get(b'rev', []), | |
1192 | destspace=destspace, |
|
1192 | destspace=destspace, | |
1193 | ) |
|
1193 | ) | |
@@ -1250,7 +1250,7 b' def _definedestmap(ui, repo, inmemory, d' | |||||
1250 | # `+ (%ld)` to work around `wdir()::` being empty |
|
1250 | # `+ (%ld)` to work around `wdir()::` being empty | |
1251 | rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) |
|
1251 | rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) | |
1252 | else: |
|
1252 | else: | |
1253 |
base = scmutil.revrange(repo, |
|
1253 | base = scmutil.revrange(repo, basef or [b'.']) | |
1254 | if not base: |
|
1254 | if not base: | |
1255 | ui.status( |
|
1255 | ui.status( | |
1256 | _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
|
1256 | _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
@@ -58,12 +58,12 b'' | |||||
58 | can use the new `conflictparents()` revset for finding the other |
|
58 | can use the new `conflictparents()` revset for finding the other | |
59 | parent during a conflict. |
|
59 | parent during a conflict. | |
60 |
|
60 | |||
61 |
* `hg rebase` now accepts repeated `--source` a |
|
61 | * `hg rebase` now accepts repeated `--source` and `--base` | |
62 |
`hg rebase --source 'A + B'` is equivalent |
|
62 | arguments. For example, `hg rebase --source 'A + B'` is equivalent | |
63 | --source B`. This is a backwards-incompatible change because it |
|
63 | to `hg rebase --source A --source B`. This is a | |
64 | will break overriding an alias `myrebase = rebase --source A` by |
|
64 | backwards-incompatible change because it will break overriding an | |
65 | `hg myrebase --source B` (it will now rebase `(A + B)::` instead of |
|
65 | alias `myrebase = rebase --source A` by `hg myrebase --source B` | |
66 | `B::`). |
|
66 | (it will now rebase `(A + B)::` instead of `B::`). | |
67 |
|
67 | |||
68 | * `hg recover` does not verify the validity of the whole repository |
|
68 | * `hg recover` does not verify the validity of the whole repository | |
69 | anymore. You can pass `--verify` or call `hg verify` if necessary. |
|
69 | anymore. You can pass `--verify` or call `hg verify` if necessary. |
@@ -156,7 +156,7 b' Multiple destinations and --collapse are' | |||||
156 |
|
156 | |||
157 | Multiple destinations cannot be used with --base: |
|
157 | Multiple destinations cannot be used with --base: | |
158 |
|
158 | |||
159 |
$ rebasewithdag -b B |
|
159 | $ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS' | |
160 | > B E |
|
160 | > B E | |
161 | > | | |
|
161 | > | | | |
162 | > A D |
|
162 | > A D |
General Comments 0
You need to be logged in to leave comments.
Login now