author | Brendan Cully <brendan@kublai.com> |
Tue, 31 Oct 2006 17:24:42 -0800 | |
changeset 3604 | 437489d8dfbf |
parent 3368 | 751df21dad72 |
child 3693 | 454b3a8cdf28 |
permissions | -rwxr-xr-x |
2907 | 1 |
#!/bin/sh |
2 |
||
3 |
hg init a |
|
4 |
cd a |
|
5 |
||
6 |
echo start > start |
|
7 |
hg ci -Amstart -d '0 0' |
|
8 |
echo new > new |
|
9 |
hg ci -Amnew -d '0 0' |
|
10 |
echo '% new file' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
11 |
hg diff --git -r 0 |
2907 | 12 |
|
13 |
hg cp new copy |
|
14 |
hg ci -mcopy -d '0 0' |
|
15 |
echo '% copy' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
16 |
hg diff --git -r 1:tip |
2907 | 17 |
|
18 |
hg mv copy rename |
|
19 |
hg ci -mrename -d '0 0' |
|
20 |
echo '% rename' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
21 |
hg diff --git -r 2:tip |
2907 | 22 |
|
23 |
hg rm rename |
|
24 |
hg ci -mdelete -d '0 0' |
|
25 |
echo '% delete' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
26 |
hg diff --git -r 3:tip |
2907 | 27 |
|
28 |
cat > src <<EOF |
|
29 |
1 |
|
30 |
2 |
|
31 |
3 |
|
32 |
4 |
|
33 |
5 |
|
34 |
EOF |
|
35 |
hg ci -Amsrc -d '0 0' |
|
36 |
chmod +x src |
|
37 |
hg ci -munexec -d '0 0' |
|
38 |
echo '% chmod 644' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
39 |
hg diff --git -r 5:tip |
2907 | 40 |
|
41 |
hg mv src dst |
|
42 |
chmod -x dst |
|
43 |
echo a >> dst |
|
44 |
hg ci -mrenamemod -d '0 0' |
|
45 |
echo '% rename+mod+chmod' |
|
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
46 |
hg diff --git -r 6:tip |
3066
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2935
diff
changeset
|
47 |
|
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2935
diff
changeset
|
48 |
echo '% nonexistent in tip+chmod' |
3199
096f1c73cdc3
Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents:
3066
diff
changeset
|
49 |
hg diff --git -r 5:6 |
3368
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
50 |
|
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
51 |
echo '% binary diff' |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
52 |
cp $TESTDIR/binfile.bin . |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
53 |
hg add binfile.bin |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
54 |
hg diff --git > b.diff |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
55 |
cat b.diff |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
56 |
|
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
57 |
echo '% import binary diff' |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
58 |
hg revert binfile.bin |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
59 |
rm binfile.bin |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
60 |
hg import -mfoo b.diff |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
61 |
cmp binfile.bin $TESTDIR/binfile.bin |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3199
diff
changeset
|
62 |