Mercurial > hg

comparison tests/test-rebase-parameters.out @ 6906:808f03f61ebe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add rebase extension
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Mon, 18 Aug 2008 21:16:31 +0200
parents
children 204c7850c158
comparison
equal deleted inserted replaced
6905:248e54a9456e 6906:808f03f61ebe
1 % These fail
2
3 % Use continue and abort
4 hg rebase: cannot use both abort and continue
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
6
7 move changeset (and descendants) to a different branch
8
9 Rebase uses repeated merging to graft changesets from one part of history
10 onto another. This can be useful for linearizing local changes relative to
11 a master development tree.
12
13 If a rebase is interrupted to manually resolve a merge, it can be continued
14 with --continue or aborted with --abort.
15
16 options:
17
18 --keep keep original revisions
19 -s --source rebase from a given revision
20 -b --base rebase from the base of a given revision
21 -d --dest rebase onto a given revision
22 --collapse collapse the rebased revisions
23 -c --continue continue an interrupted rebase
24 -a --abort abort an interrupted rebase
25 --style display using template map file
26 --template display with template
27
28 use "hg -v help rebase" to show global options
29
30 % Use continue and collapse
31 hg rebase: cannot use collapse with continue or abort
32 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
33
34 move changeset (and descendants) to a different branch
35
36 Rebase uses repeated merging to graft changesets from one part of history
37 onto another. This can be useful for linearizing local changes relative to
38 a master development tree.
39
40 If a rebase is interrupted to manually resolve a merge, it can be continued
41 with --continue or aborted with --abort.
42
43 options:
44
45 --keep keep original revisions
46 -s --source rebase from a given revision
47 -b --base rebase from the base of a given revision
48 -d --dest rebase onto a given revision
49 --collapse collapse the rebased revisions
50 -c --continue continue an interrupted rebase
51 -a --abort abort an interrupted rebase
52 --style display using template map file
53 --template display with template
54
55 use "hg -v help rebase" to show global options
56
57 % Use continue/abort and dest/source
58 hg rebase: abort and continue do not allow specifying revisions
59 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
60
61 move changeset (and descendants) to a different branch
62
63 Rebase uses repeated merging to graft changesets from one part of history
64 onto another. This can be useful for linearizing local changes relative to
65 a master development tree.
66
67 If a rebase is interrupted to manually resolve a merge, it can be continued
68 with --continue or aborted with --abort.
69
70 options:
71
72 --keep keep original revisions
73 -s --source rebase from a given revision
74 -b --base rebase from the base of a given revision
75 -d --dest rebase onto a given revision
76 --collapse collapse the rebased revisions
77 -c --continue continue an interrupted rebase
78 -a --abort abort an interrupted rebase
79 --style display using template map file
80 --template display with template
81
82 use "hg -v help rebase" to show global options
83
84 % Use source and base
85 hg rebase: cannot specify both a revision and a base
86 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
87
88 move changeset (and descendants) to a different branch
89
90 Rebase uses repeated merging to graft changesets from one part of history
91 onto another. This can be useful for linearizing local changes relative to
92 a master development tree.
93
94 If a rebase is interrupted to manually resolve a merge, it can be continued
95 with --continue or aborted with --abort.
96
97 options:
98
99 --keep keep original revisions
100 -s --source rebase from a given revision
101 -b --base rebase from the base of a given revision
102 -d --dest rebase onto a given revision
103 --collapse collapse the rebased revisions
104 -c --continue continue an interrupted rebase
105 -a --abort abort an interrupted rebase
106 --style display using template map file
107 --template display with template
108
109 use "hg -v help rebase" to show global options
110
111 % Rebase with no arguments - from current
112 nothing to rebase
113
114 % Rebase with no arguments - from the current branch
115 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
116 nothing to rebase
117 % ----------
118 % These work
119
120 % Rebase with no arguments (from 3 onto 7)
121 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
122 saving bundle to
123 adding branch
124 adding changesets
125 adding manifests
126 adding file changes
127 added 5 changesets with 5 changes to 5 files
128 rebase completed
129
130 % Rebase with base == '.' => same as no arguments (from 3 onto 7)
131 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
132 saving bundle to
133 adding branch
134 adding changesets
135 adding manifests
136 adding file changes
137 added 5 changesets with 5 changes to 5 files
138 rebase completed
139
140 % Rebase with dest == default => same as no arguments (from 3 onto 7)
141 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
142 saving bundle to
143 adding branch
144 adding changesets
145 adding manifests
146 adding file changes
147 added 5 changesets with 5 changes to 5 files
148 rebase completed
149
150 % Specify only source (from 4 onto 7)
151 saving bundle to
152 adding branch
153 adding changesets
154 adding manifests
155 adding file changes
156 added 4 changesets with 4 changes to 4 files (-1 heads)
157 rebase completed
158
159 % Specify only dest (from 3 onto 6)
160 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
161 saving bundle to
162 adding branch
163 adding changesets
164 adding manifests
165 adding file changes
166 added 5 changesets with 5 changes to 5 files (+1 heads)
167 rebase completed
168
169 % Specify only base (from 3 onto 7)
170 saving bundle to
171 adding branch
172 adding changesets
173 adding manifests
174 adding file changes
175 added 5 changesets with 5 changes to 5 files
176 rebase completed
177
178 % Specify source and dest (from 4 onto 6)
179 saving bundle to
180 adding branch
181 adding changesets
182 adding manifests
183 adding file changes
184 added 4 changesets with 4 changes to 4 files
185 rebase completed
186
187 % Specify base and dest (from 3 onto 6)
188 saving bundle to
189 adding branch
190 adding changesets
191 adding manifests
192 adding file changes
193 added 5 changesets with 5 changes to 5 files (+1 heads)
194 rebase completed