Mercurial > hg
annotate tests/test-rebase-parameters.out @ 11201:34023f2ca305
Fix up rebase's handling of strip backups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 12:21:35 -0500 |
parents | 4bb4895e1693 |
children | f974fe896921 |
rev | line source |
---|---|
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
1 % These fail |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
2 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
3 % Use continue and abort |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
4 hg rebase: cannot use both abort and continue |
10636 | 5 hg rebase [-s REV | -b REV] [-d REV] [options] |
6 hg rebase {-a|-c} | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
7 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
8 move changeset (and descendants) to a different branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
9 |
9073
ec1cd3176625
rebase: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8076
diff
changeset
|
10 Rebase uses repeated merging to graft changesets from one part of history |
10636 | 11 (the source) onto another (the destination). This can be useful for |
11188
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
12 linearizing *local* changes relative to a master development tree. |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
13 |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
14 You should not rebase changesets that have already been shared with |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
15 others. Doing so will force everybody else to perform the same rebase or |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
16 they will end up with duplicated changesets after pulling in your rebased |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
17 changesets. |
10636 | 18 |
19 If you don't specify a destination changeset ("-d/--dest"), rebase uses | |
20 the tipmost head of the current named branch as the destination. (The | |
21 destination changeset is not modified by rebasing, but new changesets are | |
22 added as its descendants.) | |
23 | |
24 You can specify which changesets to rebase in two ways: as a "source" | |
25 changeset or as a "base" changeset. Both are shorthand for a topologically | |
26 related set of changesets (the "source branch"). If you specify source | |
27 ("-s/--source"), rebase will rebase that changeset and all of its | |
28 descendants onto dest. If you specify base ("-b/--base"), rebase will | |
29 select ancestors of base back to but not including the common ancestor | |
30 with dest. Thus, "-b" is less precise but more convenient than "-s": you | |
31 can specify any changeset in the source branch, and rebase will select the | |
32 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent | |
33 of the working directory as the base. | |
34 | |
35 By default, rebase recreates the changesets in the source branch as | |
36 descendants of dest and then destroys the originals. Use "--keep" to | |
37 preserve the original source changesets. Some changesets in the source | |
38 branch (e.g. merges from the destination branch) may be dropped if they no | |
39 longer contribute any change. | |
40 | |
41 One result of the rules for selecting the destination changeset and source | |
42 branch is that, unlike "merge", rebase will do nothing if you are at the | |
43 latest (tipmost) head of a named branch with two heads. You need to | |
44 explicitly specify source and/or destination (or "update" to the other | |
45 head, if it's the head of the intended source branch). | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
46 |
7999
b25110140573
rebase: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7951
diff
changeset
|
47 If a rebase is interrupted to manually resolve a merge, it can be |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8031
diff
changeset
|
48 continued with --continue/-c or aborted with --abort/-a. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
49 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
50 options: |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
51 |
10636 | 52 -s --source rebase from the specified changeset |
53 -b --base rebase from the base of the specified changeset (up to | |
54 greatest common ancestor of base and dest) | |
55 -d --dest rebase onto the specified changeset | |
9589
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
56 --collapse collapse the rebased changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
57 --keep keep original changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
58 --keepbranches keep original branch names |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
9599
diff
changeset
|
59 --detach force detaching of source from its original branch |
7468
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
60 -c --continue continue an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
61 -a --abort abort an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
62 --style display using template map file |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
63 --template display with template |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
64 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
65 use "hg -v help rebase" to show global options |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
66 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
67 % Use continue and collapse |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
68 hg rebase: cannot use collapse with continue or abort |
10636 | 69 hg rebase [-s REV | -b REV] [-d REV] [options] |
70 hg rebase {-a|-c} | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
71 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
72 move changeset (and descendants) to a different branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
73 |
9073
ec1cd3176625
rebase: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8076
diff
changeset
|
74 Rebase uses repeated merging to graft changesets from one part of history |
10636 | 75 (the source) onto another (the destination). This can be useful for |
11188
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
76 linearizing *local* changes relative to a master development tree. |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
77 |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
78 You should not rebase changesets that have already been shared with |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
79 others. Doing so will force everybody else to perform the same rebase or |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
80 they will end up with duplicated changesets after pulling in your rebased |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
81 changesets. |
10636 | 82 |
83 If you don't specify a destination changeset ("-d/--dest"), rebase uses | |
84 the tipmost head of the current named branch as the destination. (The | |
85 destination changeset is not modified by rebasing, but new changesets are | |
86 added as its descendants.) | |
87 | |
88 You can specify which changesets to rebase in two ways: as a "source" | |
89 changeset or as a "base" changeset. Both are shorthand for a topologically | |
90 related set of changesets (the "source branch"). If you specify source | |
91 ("-s/--source"), rebase will rebase that changeset and all of its | |
92 descendants onto dest. If you specify base ("-b/--base"), rebase will | |
93 select ancestors of base back to but not including the common ancestor | |
94 with dest. Thus, "-b" is less precise but more convenient than "-s": you | |
95 can specify any changeset in the source branch, and rebase will select the | |
96 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent | |
97 of the working directory as the base. | |
98 | |
99 By default, rebase recreates the changesets in the source branch as | |
100 descendants of dest and then destroys the originals. Use "--keep" to | |
101 preserve the original source changesets. Some changesets in the source | |
102 branch (e.g. merges from the destination branch) may be dropped if they no | |
103 longer contribute any change. | |
104 | |
105 One result of the rules for selecting the destination changeset and source | |
106 branch is that, unlike "merge", rebase will do nothing if you are at the | |
107 latest (tipmost) head of a named branch with two heads. You need to | |
108 explicitly specify source and/or destination (or "update" to the other | |
109 head, if it's the head of the intended source branch). | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
110 |
7999
b25110140573
rebase: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7951
diff
changeset
|
111 If a rebase is interrupted to manually resolve a merge, it can be |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8031
diff
changeset
|
112 continued with --continue/-c or aborted with --abort/-a. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
113 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
114 options: |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
115 |
10636 | 116 -s --source rebase from the specified changeset |
117 -b --base rebase from the base of the specified changeset (up to | |
118 greatest common ancestor of base and dest) | |
119 -d --dest rebase onto the specified changeset | |
9589
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
120 --collapse collapse the rebased changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
121 --keep keep original changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
122 --keepbranches keep original branch names |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
9599
diff
changeset
|
123 --detach force detaching of source from its original branch |
7468
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
124 -c --continue continue an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
125 -a --abort abort an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
126 --style display using template map file |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
127 --template display with template |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
128 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
129 use "hg -v help rebase" to show global options |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
130 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
131 % Use continue/abort and dest/source |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
132 hg rebase: abort and continue do not allow specifying revisions |
10636 | 133 hg rebase [-s REV | -b REV] [-d REV] [options] |
134 hg rebase {-a|-c} | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
135 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
136 move changeset (and descendants) to a different branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
137 |
9073
ec1cd3176625
rebase: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8076
diff
changeset
|
138 Rebase uses repeated merging to graft changesets from one part of history |
10636 | 139 (the source) onto another (the destination). This can be useful for |
11188
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
140 linearizing *local* changes relative to a master development tree. |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
141 |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
142 You should not rebase changesets that have already been shared with |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
143 others. Doing so will force everybody else to perform the same rebase or |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
144 they will end up with duplicated changesets after pulling in your rebased |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
145 changesets. |
10636 | 146 |
147 If you don't specify a destination changeset ("-d/--dest"), rebase uses | |
148 the tipmost head of the current named branch as the destination. (The | |
149 destination changeset is not modified by rebasing, but new changesets are | |
150 added as its descendants.) | |
151 | |
152 You can specify which changesets to rebase in two ways: as a "source" | |
153 changeset or as a "base" changeset. Both are shorthand for a topologically | |
154 related set of changesets (the "source branch"). If you specify source | |
155 ("-s/--source"), rebase will rebase that changeset and all of its | |
156 descendants onto dest. If you specify base ("-b/--base"), rebase will | |
157 select ancestors of base back to but not including the common ancestor | |
158 with dest. Thus, "-b" is less precise but more convenient than "-s": you | |
159 can specify any changeset in the source branch, and rebase will select the | |
160 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent | |
161 of the working directory as the base. | |
162 | |
163 By default, rebase recreates the changesets in the source branch as | |
164 descendants of dest and then destroys the originals. Use "--keep" to | |
165 preserve the original source changesets. Some changesets in the source | |
166 branch (e.g. merges from the destination branch) may be dropped if they no | |
167 longer contribute any change. | |
168 | |
169 One result of the rules for selecting the destination changeset and source | |
170 branch is that, unlike "merge", rebase will do nothing if you are at the | |
171 latest (tipmost) head of a named branch with two heads. You need to | |
172 explicitly specify source and/or destination (or "update" to the other | |
173 head, if it's the head of the intended source branch). | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
174 |
7999
b25110140573
rebase: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7951
diff
changeset
|
175 If a rebase is interrupted to manually resolve a merge, it can be |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8031
diff
changeset
|
176 continued with --continue/-c or aborted with --abort/-a. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
177 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
178 options: |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
179 |
10636 | 180 -s --source rebase from the specified changeset |
181 -b --base rebase from the base of the specified changeset (up to | |
182 greatest common ancestor of base and dest) | |
183 -d --dest rebase onto the specified changeset | |
9589
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
184 --collapse collapse the rebased changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
185 --keep keep original changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
186 --keepbranches keep original branch names |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
9599
diff
changeset
|
187 --detach force detaching of source from its original branch |
7468
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
188 -c --continue continue an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
189 -a --abort abort an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
190 --style display using template map file |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
191 --template display with template |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
192 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
193 use "hg -v help rebase" to show global options |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
194 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
195 % Use source and base |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
196 hg rebase: cannot specify both a revision and a base |
10636 | 197 hg rebase [-s REV | -b REV] [-d REV] [options] |
198 hg rebase {-a|-c} | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
199 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
200 move changeset (and descendants) to a different branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
201 |
9073
ec1cd3176625
rebase: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8076
diff
changeset
|
202 Rebase uses repeated merging to graft changesets from one part of history |
10636 | 203 (the source) onto another (the destination). This can be useful for |
11188
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
204 linearizing *local* changes relative to a master development tree. |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
205 |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
206 You should not rebase changesets that have already been shared with |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
207 others. Doing so will force everybody else to perform the same rebase or |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
208 they will end up with duplicated changesets after pulling in your rebased |
b5c0f6a11430
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net>
parents:
10636
diff
changeset
|
209 changesets. |
10636 | 210 |
211 If you don't specify a destination changeset ("-d/--dest"), rebase uses | |
212 the tipmost head of the current named branch as the destination. (The | |
213 destination changeset is not modified by rebasing, but new changesets are | |
214 added as its descendants.) | |
215 | |
216 You can specify which changesets to rebase in two ways: as a "source" | |
217 changeset or as a "base" changeset. Both are shorthand for a topologically | |
218 related set of changesets (the "source branch"). If you specify source | |
219 ("-s/--source"), rebase will rebase that changeset and all of its | |
220 descendants onto dest. If you specify base ("-b/--base"), rebase will | |
221 select ancestors of base back to but not including the common ancestor | |
222 with dest. Thus, "-b" is less precise but more convenient than "-s": you | |
223 can specify any changeset in the source branch, and rebase will select the | |
224 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent | |
225 of the working directory as the base. | |
226 | |
227 By default, rebase recreates the changesets in the source branch as | |
228 descendants of dest and then destroys the originals. Use "--keep" to | |
229 preserve the original source changesets. Some changesets in the source | |
230 branch (e.g. merges from the destination branch) may be dropped if they no | |
231 longer contribute any change. | |
232 | |
233 One result of the rules for selecting the destination changeset and source | |
234 branch is that, unlike "merge", rebase will do nothing if you are at the | |
235 latest (tipmost) head of a named branch with two heads. You need to | |
236 explicitly specify source and/or destination (or "update" to the other | |
237 head, if it's the head of the intended source branch). | |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
238 |
7999
b25110140573
rebase: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7951
diff
changeset
|
239 If a rebase is interrupted to manually resolve a merge, it can be |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8031
diff
changeset
|
240 continued with --continue/-c or aborted with --abort/-a. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
241 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
242 options: |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
243 |
10636 | 244 -s --source rebase from the specified changeset |
245 -b --base rebase from the base of the specified changeset (up to | |
246 greatest common ancestor of base and dest) | |
247 -d --dest rebase onto the specified changeset | |
9589
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
248 --collapse collapse the rebased changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
249 --keep keep original changesets |
fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org
parents:
8076
diff
changeset
|
250 --keepbranches keep original branch names |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
9599
diff
changeset
|
251 --detach force detaching of source from its original branch |
7468
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
252 -c --continue continue an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
253 -a --abort abort an interrupted rebase |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
254 --style display using template map file |
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
7130
diff
changeset
|
255 --template display with template |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
256 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
257 use "hg -v help rebase" to show global options |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
258 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
259 % Rebase with no arguments - from current |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
260 nothing to rebase |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
261 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
262 % Rebase with no arguments - from the current branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
263 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
264 nothing to rebase |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
265 % ---------- |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
266 % These work |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
267 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
268 % Rebase with no arguments (from 3 onto 7) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
269 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
270 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
271 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
272 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
273 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
274 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
275 added 5 changesets with 5 changes to 5 files |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
276 rebase completed |
7130
204c7850c158
rebase: disable rollback after rebasing
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6906
diff
changeset
|
277 % Try to rollback after a rebase (fail) |
204c7850c158
rebase: disable rollback after rebasing
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6906
diff
changeset
|
278 no rollback information available |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
279 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
280 % Rebase with base == '.' => same as no arguments (from 3 onto 7) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
281 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
282 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
283 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
284 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
285 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
286 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
287 added 5 changesets with 5 changes to 5 files |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
288 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
289 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
290 % Rebase with dest == default => same as no arguments (from 3 onto 7) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
291 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
292 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
293 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
294 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
295 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
296 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
297 added 5 changesets with 5 changes to 5 files |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
298 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
299 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
300 % Specify only source (from 4 onto 7) |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
301 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
302 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
303 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
304 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
305 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
306 added 4 changesets with 4 changes to 4 files (-1 heads) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
307 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
308 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
309 % Specify only dest (from 3 onto 6) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
310 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
311 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
312 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
313 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
314 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
315 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
316 added 5 changesets with 5 changes to 5 files (+1 heads) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
317 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
318 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
319 % Specify only base (from 3 onto 7) |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
320 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
321 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
322 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
323 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
324 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
325 added 5 changesets with 5 changes to 5 files |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
326 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
327 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
328 % Specify source and dest (from 4 onto 6) |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
329 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
330 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
331 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
332 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
333 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
334 added 4 changesets with 4 changes to 4 files |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
335 rebase completed |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
336 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
337 % Specify base and dest (from 3 onto 6) |
11201
34023f2ca305
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
338 saved backup bundle to |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
339 adding branch |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
340 adding changesets |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
341 adding manifests |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
342 adding file changes |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
343 added 5 changesets with 5 changes to 5 files (+1 heads) |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
344 rebase completed |