##// END OF EJS Templates
test-patch.t: typos
Christian Ebert -
r11815:20a88cf7 default
parent child Browse files
Show More
@@ -1,41 +1,41 b''
1 $ cat > patchtool.py <<EOF
1 $ cat > patchtool.py <<EOF
2 > import sys
2 > import sys
3 > print 'Using custom patch'
3 > print 'Using custom patch'
4 > if '--binary' in sys.argv:
4 > if '--binary' in sys.argv:
5 > print '--binary found !'
5 > print '--binary found !'
6 > EOF
6 > EOF
7
7
8 $ echo "[ui]" >> $HGRCPATH
8 $ echo "[ui]" >> $HGRCPATH
9 $ echo "patch=python ../patchtool.py" >> $HGRCPATH
9 $ echo "patch=python ../patchtool.py" >> $HGRCPATH
10
10
11 $ hg init a
11 $ hg init a
12 $ cd a
12 $ cd a
13 $ echo a > a
13 $ echo a > a
14 $ hg commit -Ama -d '1 0'
14 $ hg commit -Ama -d '1 0'
15 adding a
15 adding a
16 $ echo b >> a
16 $ echo b >> a
17 $ hg commit -Amb -d '2 0'
17 $ hg commit -Amb -d '2 0'
18 $ cd ..
18 $ cd ..
19
19
20 This test check that:
20 This test checks that:
21 - custom patch commands with arguments actually works
21 - custom patch commands with arguments actually work
22 - patch code does not try to add weird arguments like
22 - patch code does not try to add weird arguments like
23 --binary when custom patch commands are used. For instance
23 --binary when custom patch commands are used. For instance
24 --binary is added by default under win32.
24 --binary is added by default under win32.
25
25
26 check custom patch options are honored
26 check custom patch options are honored
27
27
28 $ hg --cwd a export -o ../a.diff tip
28 $ hg --cwd a export -o ../a.diff tip
29 $ hg clone -r 0 a b
29 $ hg clone -r 0 a b
30 requesting all changes
30 requesting all changes
31 adding changesets
31 adding changesets
32 adding manifests
32 adding manifests
33 adding file changes
33 adding file changes
34 added 1 changesets with 1 changes to 1 files
34 added 1 changesets with 1 changes to 1 files
35 updating to branch default
35 updating to branch default
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37
37
38 $ hg --cwd b import -v ../a.diff
38 $ hg --cwd b import -v ../a.diff
39 applying ../a.diff
39 applying ../a.diff
40 Using custom patch
40 Using custom patch
41
41
General Comments 0
You need to be logged in to leave comments. Login now