Mercurial > hg

comparison tests/test-commit-amend.t @ 16900:3f1a153daadb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: glob the remaining 'saved backup bundle to' to prepare for windows
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 10 Jun 2012 14:14:52 +0200
parents 27b2e1823e83
children 5b89700cce30
comparison
equal deleted inserted replaced
16899:8149ff405c78 16900:3f1a153daadb
27 27
28 Amending changeset with changes in working dir: 28 Amending changeset with changes in working dir:
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
36 +++ b/a Thu Jan 01 00:00:00 1970 +0000 36 +++ b/a Thu Jan 01 00:00:00 1970 +0000
37 @@ -1,1 +1,3 @@ 37 @@ -1,1 +1,3 @@
54 Add new file: 54 Add new file:
55 55
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
69 [1] 69 [1]
70 70
74 amending changeset 664a9b2d60cd 74 amending changeset 664a9b2d60cd
75 copying changeset 664a9b2d60cd to ad120869acf0 75 copying changeset 664a9b2d60cd to ad120869acf0
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
83 adding manifests 83 adding manifests
84 adding file changes 84 adding file changes
111 $ echo 'commit=' >> $HGRCPATH 111 $ echo 'commit=' >> $HGRCPATH
112 112
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
123 user: foo 123 user: foo
124 date: Thu Jan 01 00:00:01 1970 +0000 124 date: Thu Jan 01 00:00:01 1970 +0000
146 HG: branch 'default' 146 HG: branch 'default'
147 HG: changed a 147 HG: changed 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
155 adding manifests 155 adding manifests
156 adding file changes 156 adding file changes
175 copying changeset 27f3aacd3011 to ad120869acf0 175 copying changeset 27f3aacd3011 to ad120869acf0
176 a 176 a
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
184 adding manifests 184 adding manifests
185 adding file changes 185 adding file changes
198 Moving bookmarks, preserve active bookmark: 198 Moving bookmarks, preserve active bookmark:
199 199
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
213 213
214 $ echo '[defaults]' >> $HGRCPATH 214 $ echo '[defaults]' >> $HGRCPATH
223 $ hg ci -m 'branch foo' 223 $ hg ci -m 'branch foo'
224 $ hg branch default -f 224 $ hg branch default -f
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
232 Close branch: 232 Close branch:
233 233
239 $ hg ci -Am 'fork' 239 $ hg ci -Am 'fork'
240 adding b 240 adding b
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
248 $ echo b >> b 248 $ echo b >> b
249 $ hg ci -m 'reopen branch' 249 $ hg ci -m 'reopen branch'
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
257 Refuse to amend merges: 257 Refuse to amend merges:
258 258
272 272
273 $ hg mv b c 273 $ hg mv b c
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
281 $ hg cp d e 281 $ hg cp d e
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
289 289
290 $ mv f f.orig 290 $ mv f f.orig
291 $ hg rm -A f 291 $ hg rm -A f
292 $ hg ci -m removef 292 $ hg ci -m removef
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
300 300
301 Move added file (issue3410): 301 Move added file (issue3410):
303 $ echo g >> g 303 $ echo g >> g
304 $ hg ci -Am g 304 $ hg ci -Am g
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"
312 312
313 313
323 marked working directory as branch a 323 marked working directory as branch a
324 (branches are permanent and global, did you want a bookmark?) 324 (branches are permanent and global, did you want a bookmark?)
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
336 Also preserve other entries in the dict that are in the old commit, 336 Also preserve other entries in the dict that are in the old commit,
337 first graft something so there's an additional entry: 337 first graft something so there's an additional entry:
344 $ hg up 11 344 $ hg up 11
345 5 files updated, 0 files merged, 1 files removed, 0 files unresolved 345 5 files updated, 0 files merged, 1 files removed, 0 files unresolved
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