Mercurial > hg
view tests/test-merge-revert @ 4418:0532491f7476
MQ: tidy up if a qpush is interrupted.
This aborts the transaction, makes sure the dirtied dirstate isn't
written out, and cleans up the working directory.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 08 May 2007 12:16:02 -0700 |
parents | 9dcf9d45cab8 |
children | 46280c004f22 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0 hg id echo "changed file1" >> file1 hg id hg revert --all hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1" >> file1 HGMERGE=merge hg update hg diff hg status hg id hg revert --all hg diff hg status hg id hg revert -r tip --all hg diff hg status hg id hg update -C hg diff hg status hg id