equal
deleted
inserted
replaced
373 |
373 |
374 File a should be clean |
374 File a should be clean |
375 |
375 |
376 $ hg status -A a |
376 $ hg status -A a |
377 C a |
377 C a |
378 |
|
379 $ rm msg |
378 $ rm msg |
380 $ hg rollback |
379 |
|
380 rollback and revert expansion |
|
381 |
|
382 $ cat a |
|
383 expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $ |
|
384 foo |
|
385 do not process $Id: |
|
386 xxx $ |
|
387 bar |
|
388 $ hg --verbose rollback |
381 rolling back to revision 2 (undo commit) |
389 rolling back to revision 2 (undo commit) |
|
390 overwriting a expanding keywords |
|
391 $ hg status a |
|
392 M a |
|
393 $ cat a |
|
394 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
395 foo |
|
396 do not process $Id: |
|
397 xxx $ |
|
398 bar |
|
399 $ echo '$Id$' > y |
|
400 $ echo '$Id$' > z |
|
401 $ hg add y |
|
402 $ hg commit -Am "rollback only" z |
|
403 $ cat z |
|
404 $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $ |
|
405 $ hg --verbose rollback |
|
406 rolling back to revision 2 (undo commit) |
|
407 overwriting z shrinking keywords |
|
408 |
|
409 Only z should be overwritten |
|
410 |
|
411 $ hg status a y z |
|
412 M a |
|
413 A y |
|
414 A z |
|
415 $ cat z |
|
416 $Id$ |
|
417 $ hg forget y z |
|
418 $ rm y z |
|
419 |
382 $ hg update -C |
420 $ hg update -C |
383 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
421 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
384 |
422 |
385 Test patch queue repo |
423 Test patch queue repo |
386 |
424 |
876 |
914 |
877 $ head -n 2 a |
915 $ head -n 2 a |
878 foobranch |
916 foobranch |
879 expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
917 expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
880 |
918 |
881 Switch of expansion |
919 Turn off expansion |
882 |
920 |
883 $ hg -q rollback |
921 $ hg -q rollback |
884 $ hg -q update -C |
922 $ hg -q update -C |
885 |
923 |
886 kwshrink with unknown file u |
924 kwshrink with unknown file u |