equal
deleted
inserted
replaced
151 echo line1 >> a |
151 echo line1 >> a |
152 echo line0 >> a |
152 echo line0 >> a |
153 hg ci -m brancha |
153 hg ci -m brancha |
154 hg import -v tip.patch |
154 hg import -v tip.patch |
155 cd .. |
155 cd .. |
|
156 |
|
157 # Test hunk touching empty files (issue906) |
|
158 hg init empty |
|
159 cd empty |
|
160 touch a |
|
161 touch b1 |
|
162 touch c1 |
|
163 echo d > d |
|
164 hg ci -Am init |
|
165 echo a > a |
|
166 echo b > b1 |
|
167 hg mv b1 b2 |
|
168 echo c > c1 |
|
169 hg copy c1 c2 |
|
170 rm d |
|
171 touch d |
|
172 hg diff --git |
|
173 hg ci -m empty |
|
174 hg export --git tip > empty.diff |
|
175 hg up -C 0 |
|
176 hg import empty.diff |
|
177 for name in a b1 b2 c1 c2 d; |
|
178 do |
|
179 echo % $name file |
|
180 test -f $name && cat $name |
|
181 done |
|
182 cd .. |
|
183 |