equal
deleted
inserted
replaced
127 hg --cwd b tip | grep 'subdir change' |
127 hg --cwd b tip | grep 'subdir change' |
128 echo "% committer should be 'someoneelse'" |
128 echo "% committer should be 'someoneelse'" |
129 hg --cwd b tip | grep someoneelse |
129 hg --cwd b tip | grep someoneelse |
130 echo "% should be empty" |
130 echo "% should be empty" |
131 hg --cwd b status |
131 hg --cwd b status |
|
132 |
|
133 |
|
134 # Test fuzziness (ambiguous patch location, fuzz=2) |
|
135 echo % test fuzziness |
|
136 hg init fuzzy |
|
137 cd fuzzy |
|
138 echo line1 > a |
|
139 echo line0 >> a |
|
140 echo line3 >> a |
|
141 hg ci -Am adda |
|
142 echo line1 > a |
|
143 echo line2 >> a |
|
144 echo line0 >> a |
|
145 echo line3 >> a |
|
146 hg ci -m change a |
|
147 hg export tip > tip.patch |
|
148 hg up -C 0 |
|
149 echo line1 > a |
|
150 echo line0 >> a |
|
151 echo line1 >> a |
|
152 echo line0 >> a |
|
153 hg ci -m brancha |
|
154 hg import -v tip.patch |
|
155 cd .. |