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