Mercurial > hg
annotate tests/test-qrecord @ 10135:9a4034b630c4 stable
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
author | Greg Onufer <gonufer@jazzhaiku.com> |
---|---|
date | Wed, 09 Dec 2009 16:56:00 -0800 |
parents | 6c82beaaa11a |
children |
rev | line source |
---|---|
5933 | 1 #!/bin/sh |
2 | |
3 echo "[ui]" >> $HGRCPATH | |
4 echo "interactive=true" >> $HGRCPATH | |
5 echo "[extensions]" >> $HGRCPATH | |
6 echo "record=" >> $HGRCPATH | |
7 | |
8 echo "% help (no mq, so no qrecord)" | |
9 | |
10 hg help qrecord | |
11 | |
12 echo "mq=" >> $HGRCPATH | |
13 | |
14 echo "% help (mq present)" | |
15 | |
16 hg help qrecord | |
17 | |
18 hg init a | |
19 cd a | |
20 | |
21 echo % base commit | |
22 | |
23 cat > 1.txt <<EOF | |
24 1 | |
25 2 | |
26 3 | |
27 4 | |
28 5 | |
29 EOF | |
30 cat > 2.txt <<EOF | |
31 a | |
32 b | |
33 c | |
34 d | |
35 e | |
36 f | |
37 EOF | |
38 mkdir dir | |
39 cat > dir/a.txt <<EOF | |
40 hello world | |
41 | |
42 someone | |
43 up | |
44 there | |
45 loves | |
46 me | |
47 EOF | |
48 | |
49 hg add 1.txt 2.txt dir/a.txt | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
6210
diff
changeset
|
50 hg commit -m 'initial checkin' |
5933 | 51 |
6210
942287cb1f57
Removed trailing spaces from everything except test output
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
52 echo % changing files |
5933 | 53 |
54 sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new | |
55 sed -e 's/b/b b/' 2.txt > 2.txt.new | |
56 sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new | |
57 | |
58 mv -f 1.txt.new 1.txt | |
59 mv -f 2.txt.new 2.txt | |
60 mv -f dir/a.txt.new dir/a.txt | |
61 | |
62 echo % whole diff | |
63 | |
64 hg diff --nodates | |
65 | |
66 echo % qrecord a.patch | |
67 | |
68 hg qrecord -d '0 0' -m aaa a.patch <<EOF | |
69 y | |
70 y | |
71 n | |
72 y | |
73 y | |
74 n | |
75 EOF | |
76 | |
77 echo | |
78 echo % "after qrecord a.patch 'tip'" | |
79 hg tip -p | |
80 echo | |
81 echo % "after qrecord a.patch 'diff'" | |
82 hg diff --nodates | |
83 | |
84 echo % qrecord b.patch | |
85 hg qrecord -d '0 0' -m bbb b.patch <<EOF | |
86 y | |
87 y | |
88 y | |
89 y | |
90 EOF | |
91 | |
92 echo | |
93 echo % "after qrecord b.patch 'tip'" | |
94 hg tip -p | |
95 echo | |
96 echo % "after qrecord b.patch 'diff'" | |
97 hg diff --nodates | |
98 | |
99 echo | |
100 echo % --- end --- |