Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2 @ 4258:47ba52121433
Add import --exact.
When this option is set, import will apply the patch (which must
be generated by export) to the parents specified in the patch,
and check that the node produced by the patch matches the node
ID in the patch.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 22 Mar 2007 10:44:59 -0700 |
| parents | 9dcf9d45cab8 |
| children | 46280c004f22 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "another line of text" >> 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 --no-backup --all hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert --no-backup --all hg diff hg status hg id hg revert -r tip --no-backup --all hg diff hg status hg id hg update -C hg diff hg status hg id