equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
|
2 |
|
3 source $TESTDIR/helpers.sh |
2 |
4 |
3 checkundo() |
5 checkundo() |
4 { |
6 { |
5 if [ -f .hg/store/undo ]; then |
7 if [ -f .hg/store/undo ]; then |
6 echo ".hg/store/undo still exists after $1" |
8 echo ".hg/store/undo still exists after $1" |
316 |
318 |
317 echo % strip |
319 echo % strip |
318 cd ../../b |
320 cd ../../b |
319 echo x>x |
321 echo x>x |
320 hg ci -Ama |
322 hg ci -Ama |
321 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
323 hg strip tip | hidebackup |
322 hg unbundle .hg/strip-backup/* |
324 hg unbundle .hg/strip-backup/* |
323 |
325 |
324 echo % strip with local changes, should complain |
326 echo % strip with local changes, should complain |
325 hg up |
327 hg up |
326 echo y>y |
328 echo y>y |
327 hg add y |
329 hg add y |
328 hg strip tip | sed 's/\(saving bundle to \).*/\1/' |
330 hg strip tip | hidebackup |
329 echo % --force strip with local changes |
331 echo % --force strip with local changes |
330 hg strip -f tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
332 hg strip -f tip | hidebackup |
331 |
333 |
332 echo '% cd b; hg qrefresh' |
334 echo '% cd b; hg qrefresh' |
333 hg init refresh |
335 hg init refresh |
334 cd refresh |
336 cd refresh |
335 echo a > a |
337 echo a > a |
500 echo 1 >> foo |
502 echo 1 >> foo |
501 hg ci -m 'change foo 2' |
503 hg ci -m 'change foo 2' |
502 HGMERGE=true hg merge |
504 HGMERGE=true hg merge |
503 hg ci -m merge |
505 hg ci -m merge |
504 hg log |
506 hg log |
505 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
507 hg strip 1 | hidebackup |
506 checkundo strip |
508 checkundo strip |
507 hg log |
509 hg log |
508 cd .. |
510 cd .. |
509 |
511 |
510 echo '% qclone' |
512 echo '% qclone' |