equal
deleted
inserted
replaced
34 hg revert --no-backup foo |
34 hg revert --no-backup foo |
35 rm foo |
35 rm foo |
36 hg qimport file://$HGTMP/url.diff |
36 hg qimport file://$HGTMP/url.diff |
37 hg qun |
37 hg qun |
38 |
38 |
|
39 echo % import patch that already exists |
|
40 echo foo2 >> foo |
|
41 hg add foo |
|
42 hg diff > ../url.diff |
|
43 hg revert --no-backup foo |
|
44 rm foo |
|
45 hg qimport ../url.diff |
|
46 hg qpush |
|
47 cat foo |
|
48 hg qpop |
|
49 echo % qimport -f |
|
50 hg qimport -f ../url.diff |
|
51 hg qpush |
|
52 cat foo |
|
53 hg qpop |
|
54 |
39 echo % build diff with CRLF |
55 echo % build diff with CRLF |
40 python ../writelines.py b 5 'a\n' 5 'a\r\n' |
56 python ../writelines.py b 5 'a\n' 5 'a\r\n' |
41 hg ci -Am addb |
57 hg ci -Am addb |
42 python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
58 python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
43 hg diff > b.diff |
59 hg diff > b.diff |