Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-revert2 @ 800:ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:19:43 +0100 |
parents | 49ec802b4a16 |
children | 69db1e34378b |
comparison
equal
deleted
inserted
replaced
799:583e290e4945 | 800:ec85f9e6f3b1 |
---|---|
1 #!/bin/sh -x | 1 #!/bin/sh |
2 | 2 |
3 mkdir t | 3 mkdir t |
4 cd t | 4 cd t |
5 hg init | 5 hg init |
6 echo "added file1" > file1 | 6 echo "added file1" > file1 |
24 hg status | 24 hg status |
25 hg id | 25 hg id |
26 hg update -C 0 | 26 hg update -C 0 |
27 echo "changed file1 different" >> file1 | 27 echo "changed file1 different" >> file1 |
28 HGMERGE=merge hg update | 28 HGMERGE=merge hg update |
29 hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" | 29 hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" |
30 hg status | 30 hg status |
31 hg id | 31 hg id |
32 hg revert | 32 hg revert |
33 hg diff | 33 hg diff |
34 hg status | 34 hg status |