Mercurial > hg
comparison tests/test-rebase-parameters.out @ 8031:813a02a4eda2
upper-case command line meta variables
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 08 Apr 2009 20:43:19 +0200 |
parents | b25110140573 |
children | 5ec526c1a32f |
comparison
equal
deleted
inserted
replaced
8030:aba10b5cdd0b | 8031:813a02a4eda2 |
---|---|
1 % These fail | 1 % These fail |
2 | 2 |
3 % Use continue and abort | 3 % Use continue and abort |
4 hg rebase: cannot use both abort and continue | 4 hg rebase: cannot use both abort and continue |
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 5 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
6 | 6 |
7 move changeset (and descendants) to a different branch | 7 move changeset (and descendants) to a different branch |
8 | 8 |
9 Rebase uses repeated merging to graft changesets from one part of | 9 Rebase uses repeated merging to graft changesets from one part of |
10 history onto another. This can be useful for linearizing local | 10 history onto another. This can be useful for linearizing local |
28 | 28 |
29 use "hg -v help rebase" to show global options | 29 use "hg -v help rebase" to show global options |
30 | 30 |
31 % Use continue and collapse | 31 % Use continue and collapse |
32 hg rebase: cannot use collapse with continue or abort | 32 hg rebase: cannot use collapse with continue or abort |
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 33 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
34 | 34 |
35 move changeset (and descendants) to a different branch | 35 move changeset (and descendants) to a different branch |
36 | 36 |
37 Rebase uses repeated merging to graft changesets from one part of | 37 Rebase uses repeated merging to graft changesets from one part of |
38 history onto another. This can be useful for linearizing local | 38 history onto another. This can be useful for linearizing local |
56 | 56 |
57 use "hg -v help rebase" to show global options | 57 use "hg -v help rebase" to show global options |
58 | 58 |
59 % Use continue/abort and dest/source | 59 % Use continue/abort and dest/source |
60 hg rebase: abort and continue do not allow specifying revisions | 60 hg rebase: abort and continue do not allow specifying revisions |
61 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 61 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
62 | 62 |
63 move changeset (and descendants) to a different branch | 63 move changeset (and descendants) to a different branch |
64 | 64 |
65 Rebase uses repeated merging to graft changesets from one part of | 65 Rebase uses repeated merging to graft changesets from one part of |
66 history onto another. This can be useful for linearizing local | 66 history onto another. This can be useful for linearizing local |
84 | 84 |
85 use "hg -v help rebase" to show global options | 85 use "hg -v help rebase" to show global options |
86 | 86 |
87 % Use source and base | 87 % Use source and base |
88 hg rebase: cannot specify both a revision and a base | 88 hg rebase: cannot specify both a revision and a base |
89 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 89 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
90 | 90 |
91 move changeset (and descendants) to a different branch | 91 move changeset (and descendants) to a different branch |
92 | 92 |
93 Rebase uses repeated merging to graft changesets from one part of | 93 Rebase uses repeated merging to graft changesets from one part of |
94 history onto another. This can be useful for linearizing local | 94 history onto another. This can be useful for linearizing local |