Show More
@@ -116,8 +116,13 b' Test that "hg rollback" restores status ' | |||||
116 | $ hg commit -m 'will be rollback-ed soon' |
|
116 | $ hg commit -m 'will be rollback-ed soon' | |
117 | $ echo largeY > largeY |
|
117 | $ echo largeY > largeY | |
118 | $ hg add --large largeY |
|
118 | $ hg add --large largeY | |
|
119 | #if windows | |||
|
120 | $ hg status -A large1 | |||
|
121 | large1: * (glob) | |||
|
122 | #else | |||
119 | $ hg status -A large1 |
|
123 | $ hg status -A large1 | |
120 | large1: No such file or directory |
|
124 | large1: No such file or directory | |
|
125 | #endif | |||
121 | $ hg status -A large2 |
|
126 | $ hg status -A large2 | |
122 | ? large2 |
|
127 | ? large2 | |
123 | $ hg status -A largeX |
|
128 | $ hg status -A largeX | |
@@ -202,24 +207,39 b' automated commit like rebase/transplant' | |||||
202 | $ hg commit -m '#4' |
|
207 | $ hg commit -m '#4' | |
203 |
|
208 | |||
204 | $ hg rebase -s 1 -d 2 --keep |
|
209 | $ hg rebase -s 1 -d 2 --keep | |
|
210 | #if windows | |||
|
211 | $ hg status -A large1 | |||
|
212 | large1: * (glob) | |||
|
213 | #else | |||
205 | $ hg status -A large1 |
|
214 | $ hg status -A large1 | |
206 | large1: No such file or directory |
|
215 | large1: No such file or directory | |
|
216 | #endif | |||
207 | $ hg status -A largeX |
|
217 | $ hg status -A largeX | |
208 | C largeX |
|
218 | C largeX | |
209 | $ hg strip -q 5 |
|
219 | $ hg strip -q 5 | |
210 |
|
220 | |||
211 | $ hg update -q -C 2 |
|
221 | $ hg update -q -C 2 | |
212 | $ hg transplant -q 1 4 |
|
222 | $ hg transplant -q 1 4 | |
|
223 | #if windows | |||
|
224 | $ hg status -A large1 | |||
|
225 | large1: * (glob) | |||
|
226 | #else | |||
213 | $ hg status -A large1 |
|
227 | $ hg status -A large1 | |
214 | large1: No such file or directory |
|
228 | large1: No such file or directory | |
|
229 | #endif | |||
215 | $ hg status -A largeX |
|
230 | $ hg status -A largeX | |
216 | C largeX |
|
231 | C largeX | |
217 | $ hg strip -q 5 |
|
232 | $ hg strip -q 5 | |
218 |
|
233 | |||
219 | $ hg update -q -C 2 |
|
234 | $ hg update -q -C 2 | |
220 | $ hg transplant -q --merge 1 --merge 4 |
|
235 | $ hg transplant -q --merge 1 --merge 4 | |
|
236 | #if windows | |||
|
237 | $ hg status -A large1 | |||
|
238 | large1: * (glob) | |||
|
239 | #else | |||
221 | $ hg status -A large1 |
|
240 | $ hg status -A large1 | |
222 | large1: No such file or directory |
|
241 | large1: No such file or directory | |
|
242 | #endif | |||
223 | $ hg status -A largeX |
|
243 | $ hg status -A largeX | |
224 | C largeX |
|
244 | C largeX | |
225 | $ hg strip -q 5 |
|
245 | $ hg strip -q 5 |
General Comments 0
You need to be logged in to leave comments.
Login now