##// END OF EJS Templates
tests: glob the remaining 'saved backup bundle to' to prepare for windows
Mads Kiilerich -
r16900:3f1a153d default
parent child Browse files
Show More
@@ -29,7 +29,7 b' Amending changeset with changes in worki'
29
29
30 $ echo a >> a
30 $ echo a >> a
31 $ hg ci --amend -m 'amend base1'
31 $ hg ci --amend -m 'amend base1'
32 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
32 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
33 $ hg diff -c .
33 $ hg diff -c .
34 diff -r ad120869acf0 -r 9cd25b479c51 a
34 diff -r ad120869acf0 -r 9cd25b479c51 a
35 --- a/a Thu Jan 01 00:00:00 1970 +0000
35 --- a/a Thu Jan 01 00:00:00 1970 +0000
@@ -56,13 +56,13 b' Add new file:'
56 $ echo b > b
56 $ echo b > b
57 $ hg ci --amend -Am 'amend base1 new file'
57 $ hg ci --amend -Am 'amend base1 new file'
58 adding b
58 adding b
59 saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg
59 saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg (glob)
60
60
61 Remove file that was added in amended commit:
61 Remove file that was added in amended commit:
62
62
63 $ hg rm b
63 $ hg rm b
64 $ hg ci --amend -m 'amend base1 remove new file'
64 $ hg ci --amend -m 'amend base1 remove new file'
65 saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg
65 saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg (glob)
66
66
67 $ hg cat b
67 $ hg cat b
68 b: no such file in rev 664a9b2d60cd
68 b: no such file in rev 664a9b2d60cd
@@ -76,7 +76,7 b' No changes, just a different message:'
76 a
76 a
77 stripping amended changeset 664a9b2d60cd
77 stripping amended changeset 664a9b2d60cd
78 1 changesets found
78 1 changesets found
79 saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg
79 saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg (glob)
80 1 changesets found
80 1 changesets found
81 adding branch
81 adding branch
82 adding changesets
82 adding changesets
@@ -113,10 +113,10 b' Disable default date on commit so when -'
113 Test -u/-d:
113 Test -u/-d:
114
114
115 $ hg ci --amend -u foo -d '1 0'
115 $ hg ci --amend -u foo -d '1 0'
116 saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg
116 saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg (glob)
117 $ echo a >> a
117 $ echo a >> a
118 $ hg ci --amend -u foo -d '1 0'
118 $ hg ci --amend -u foo -d '1 0'
119 saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg
119 saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg (glob)
120 $ hg log -r .
120 $ hg log -r .
121 changeset: 1:2c94e4a5756f
121 changeset: 1:2c94e4a5756f
122 tag: tip
122 tag: tip
@@ -148,7 +148,7 b' Open editor with old commit message if a'
148 a
148 a
149 stripping amended changeset 2c94e4a5756f
149 stripping amended changeset 2c94e4a5756f
150 1 changesets found
150 1 changesets found
151 saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg
151 saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg (glob)
152 1 changesets found
152 1 changesets found
153 adding branch
153 adding branch
154 adding changesets
154 adding changesets
@@ -177,7 +177,7 b' Same, but with changes in working dir (d'
177 stripping intermediate changeset 27f3aacd3011
177 stripping intermediate changeset 27f3aacd3011
178 stripping amended changeset ffb49186f961
178 stripping amended changeset ffb49186f961
179 2 changesets found
179 2 changesets found
180 saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg
180 saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg (glob)
181 1 changesets found
181 1 changesets found
182 adding branch
182 adding branch
183 adding changesets
183 adding changesets
@@ -200,13 +200,13 b' Moving bookmarks, preserve active bookma'
200 $ hg book book1
200 $ hg book book1
201 $ hg book book2
201 $ hg book book2
202 $ hg ci --amend -m 'move bookmarks'
202 $ hg ci --amend -m 'move bookmarks'
203 saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg
203 saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg (glob)
204 $ hg book
204 $ hg book
205 book1 1:0cf1c7a51bcf
205 book1 1:0cf1c7a51bcf
206 * book2 1:0cf1c7a51bcf
206 * book2 1:0cf1c7a51bcf
207 $ echo a >> a
207 $ echo a >> a
208 $ hg ci --amend -m 'move bookmarks'
208 $ hg ci --amend -m 'move bookmarks'
209 saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg
209 saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg (glob)
210 $ hg book
210 $ hg book
211 book1 1:7344472bd951
211 book1 1:7344472bd951
212 * book2 1:7344472bd951
212 * book2 1:7344472bd951
@@ -225,7 +225,7 b' Moving branches:'
225 marked working directory as branch default
225 marked working directory as branch default
226 (branches are permanent and global, did you want a bookmark?)
226 (branches are permanent and global, did you want a bookmark?)
227 $ hg ci --amend -m 'back to default'
227 $ hg ci --amend -m 'back to default'
228 saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg
228 saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg (glob)
229 $ hg branches
229 $ hg branches
230 default 2:f24ee5961967
230 default 2:f24ee5961967
231
231
@@ -241,7 +241,7 b' Close branch:'
241 $ echo b >> b
241 $ echo b >> b
242 $ hg ci -mb
242 $ hg ci -mb
243 $ hg ci --amend --close-branch -m 'closing branch foo'
243 $ hg ci --amend --close-branch -m 'closing branch foo'
244 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg
244 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
245
245
246 Same thing, different code path:
246 Same thing, different code path:
247
247
@@ -250,7 +250,7 b' Same thing, different code path:'
250 reopening closed branch head 4
250 reopening closed branch head 4
251 $ echo b >> b
251 $ echo b >> b
252 $ hg ci --amend --close-branch
252 $ hg ci --amend --close-branch
253 saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg
253 saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg (glob)
254 $ hg branches
254 $ hg branches
255 default 2:f24ee5961967
255 default 2:f24ee5961967
256
256
@@ -274,7 +274,7 b' Follow copies/renames:'
274 $ hg ci -m 'b -> c'
274 $ hg ci -m 'b -> c'
275 $ hg mv c d
275 $ hg mv c d
276 $ hg ci --amend -m 'b -> d'
276 $ hg ci --amend -m 'b -> d'
277 saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg
277 saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg (glob)
278 $ hg st --rev '.^' --copies d
278 $ hg st --rev '.^' --copies d
279 A d
279 A d
280 b
280 b
@@ -282,7 +282,7 b' Follow copies/renames:'
282 $ hg ci -m 'e = d'
282 $ hg ci -m 'e = d'
283 $ hg cp e f
283 $ hg cp e f
284 $ hg ci --amend -m 'f = d'
284 $ hg ci --amend -m 'f = d'
285 saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg
285 saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg (glob)
286 $ hg st --rev '.^' --copies f
286 $ hg st --rev '.^' --copies f
287 A f
287 A f
288 d
288 d
@@ -293,7 +293,7 b' Follow copies/renames:'
293 $ hg cp a f
293 $ hg cp a f
294 $ mv f.orig f
294 $ mv f.orig f
295 $ hg ci --amend -m replacef
295 $ hg ci --amend -m replacef
296 saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg
296 saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg (glob)
297 $ hg st --change . --copies
297 $ hg st --change . --copies
298 $ hg log -r . --template "{file_copies}\n"
298 $ hg log -r . --template "{file_copies}\n"
299
299
@@ -305,7 +305,7 b' Move added file (issue3410):'
305 adding g
305 adding g
306 $ hg mv g h
306 $ hg mv g h
307 $ hg ci --amend
307 $ hg ci --amend
308 saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg
308 saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg (glob)
309 $ hg st --change . --copies h
309 $ hg st --change . --copies h
310 A h
310 A h
311 $ hg log -r . --template "{file_copies}\n"
311 $ hg log -r . --template "{file_copies}\n"
@@ -325,11 +325,11 b' Preserve extra dict (issue3430):'
325 $ echo a >> a
325 $ echo a >> a
326 $ hg ci -ma
326 $ hg ci -ma
327 $ hg ci --amend -m "a'"
327 $ hg ci --amend -m "a'"
328 saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg
328 saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg (glob)
329 $ hg log -r . --template "{branch}\n"
329 $ hg log -r . --template "{branch}\n"
330 a
330 a
331 $ hg ci --amend -m "a''"
331 $ hg ci --amend -m "a''"
332 saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg
332 saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg (glob)
333 $ hg log -r . --template "{branch}\n"
333 $ hg log -r . --template "{branch}\n"
334 a
334 a
335
335
@@ -346,7 +346,7 b" first graft something so there's an addi"
346 $ hg graft 12
346 $ hg graft 12
347 grafting revision 12
347 grafting revision 12
348 $ hg ci --amend -m 'graft amend'
348 $ hg ci --amend -m 'graft amend'
349 saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg
349 saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg (glob)
350 $ hg log -r . --debug | grep extra
350 $ hg log -r . --debug | grep extra
351 extra: branch=a
351 extra: branch=a
352 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
352 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
@@ -514,7 +514,7 b' revisions (this was a very bad bug that '
514 Invoking status precommit hook
514 Invoking status precommit hook
515 M sub/normal4
515 M sub/normal4
516 M sub2/large6
516 M sub2/large6
517 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
517 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
518 nothing to rebase
518 nothing to rebase
519 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
519 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
520 9:598410d3eb9a modify normal file largefile in repo d
520 9:598410d3eb9a modify normal file largefile in repo d
@@ -552,7 +552,7 b' revisions (this was a very bad bug that '
552 Invoking status precommit hook
552 Invoking status precommit hook
553 M sub/normal4
553 M sub/normal4
554 M sub2/large6
554 M sub2/large6
555 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
555 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
556 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
556 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
557 9:598410d3eb9a modify normal file largefile in repo d
557 9:598410d3eb9a modify normal file largefile in repo d
558 8:a381d2c8c80e modify normal file and largefile in repo b
558 8:a381d2c8c80e modify normal file and largefile in repo b
General Comments 0
You need to be logged in to leave comments. Login now