Show More
@@ -158,47 +158,47 b' Cases are run as shown in that table, ro' | |||
|
158 | 158 | parent=3 |
|
159 | 159 | M sub/suba |
|
160 | 160 | |
|
161 |
$ revtest '- |
|
|
161 | $ revtest '--clean dirty linear' dirty 1 2 --clean | |
|
162 | 162 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 | 163 | parent=2 |
|
164 | 164 | |
|
165 | $ revtest '-c dirty linear' dirty 1 2 -c | |
|
165 | $ revtest '--check dirty linear' dirty 1 2 --check | |
|
166 | 166 | abort: uncommitted changes |
|
167 | 167 | parent=1 |
|
168 | 168 | M foo |
|
169 | 169 | |
|
170 | $ revtest '-m dirty linear' dirty 1 2 -m | |
|
170 | $ revtest '--merge dirty linear' dirty 1 2 --merge | |
|
171 | 171 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
172 | 172 | parent=2 |
|
173 | 173 | M foo |
|
174 | 174 | |
|
175 | $ revtest '-m dirty cross' dirty 3 4 -m | |
|
175 | $ revtest '--merge dirty cross' dirty 3 4 --merge | |
|
176 | 176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
177 | 177 | parent=4 |
|
178 | 178 | M foo |
|
179 | 179 | |
|
180 | $ revtest '-c dirtysub linear' dirtysub 1 2 -c | |
|
180 | $ revtest '--check dirtysub linear' dirtysub 1 2 --check | |
|
181 | 181 | abort: uncommitted changes in subrepository "sub" |
|
182 | 182 | parent=1 |
|
183 | 183 | M sub/suba |
|
184 | 184 | |
|
185 | $ norevtest '-c clean same' clean 2 -c | |
|
185 | $ norevtest '--check clean same' clean 2 -c | |
|
186 | 186 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
187 | 187 | updated to "bd10386d478c: 2" |
|
188 | 188 | 1 other heads for branch "default" |
|
189 | 189 | parent=2 |
|
190 | 190 | |
|
191 |
$ revtest '- |
|
|
191 | $ revtest '--check --clean dirty linear' dirty 1 2 "--check --clean" | |
|
192 | 192 | abort: cannot specify both --clean and --check |
|
193 | 193 | parent=1 |
|
194 | 194 | M foo |
|
195 | 195 | |
|
196 |
$ revtest '- |
|
|
196 | $ revtest '--merge -checkc dirty linear' dirty 1 2 "--merge --check" | |
|
197 | 197 | abort: cannot specify both --check and --merge |
|
198 | 198 | parent=1 |
|
199 | 199 | M foo |
|
200 | 200 | |
|
201 |
$ revtest '- |
|
|
201 | $ revtest '--merge -clean dirty linear' dirty 1 2 "--merge --clean" | |
|
202 | 202 | abort: cannot specify both --clean and --merge |
|
203 | 203 | parent=1 |
|
204 | 204 | M foo |
@@ -211,12 +211,17 b' Cases are run as shown in that table, ro' | |||
|
211 | 211 | parent=1 |
|
212 | 212 | M foo |
|
213 | 213 | |
|
214 | $ revtest 'none dirty linear' dirty 1 2 -c | |
|
214 | $ revtest 'none dirty linear' dirty 1 2 --check | |
|
215 | 215 | abort: uncommitted changes |
|
216 | 216 | parent=1 |
|
217 | 217 | M foo |
|
218 | 218 | |
|
219 |
$ revtest 'none dirty linear' dirty 1 2 - |
|
|
219 | $ revtest '--merge none dirty linear' dirty 1 2 --check | |
|
220 | abort: uncommitted changes | |
|
221 | parent=1 | |
|
222 | M foo | |
|
223 | ||
|
224 | $ revtest 'none dirty linear' dirty 1 2 --clean | |
|
220 | 225 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
221 | 226 | parent=2 |
|
222 | 227 | |
@@ -232,12 +237,12 b' Cases are run as shown in that table, ro' | |||
|
232 | 237 | parent=2 |
|
233 | 238 | M foo |
|
234 | 239 | |
|
235 | $ revtest 'none dirty linear' dirty 1 2 -c | |
|
240 | $ revtest 'none dirty linear' dirty 1 2 --check | |
|
236 | 241 | abort: uncommitted changes |
|
237 | 242 | parent=1 |
|
238 | 243 | M foo |
|
239 | 244 | |
|
240 |
$ revtest 'none dirty linear' dirty 1 2 - |
|
|
245 | $ revtest 'none dirty linear' dirty 1 2 --clean | |
|
241 | 246 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
242 | 247 | parent=2 |
|
243 | 248 |
General Comments 0
You need to be logged in to leave comments.
Login now