equal
deleted
inserted
replaced
145 --- a/a |
145 --- a/a |
146 +++ b/a |
146 +++ b/a |
147 @@ -1,1 +1,2 @@ |
147 @@ -1,1 +1,2 @@ |
148 line 1 |
148 line 1 |
149 +line 2 |
149 +line 2 |
|
150 $ rm -r b |
|
151 |
|
152 |
|
153 import of malformed plain diff should fail |
|
154 |
|
155 $ hg clone -r0 a b |
|
156 requesting all changes |
|
157 adding changesets |
|
158 adding manifests |
|
159 adding file changes |
|
160 added 1 changesets with 2 changes to 2 files |
|
161 updating to branch default |
|
162 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 $ hg --cwd a diff -r0:1 > tip.patch |
|
164 $ sed 's/1,1/foo/' < tip.patch > broken.patch |
|
165 $ hg --cwd b import -mpatch ../broken.patch |
|
166 applying ../broken.patch |
|
167 abort: bad hunk #1 |
|
168 [255] |
150 $ rm -r b |
169 $ rm -r b |
151 |
170 |
152 |
171 |
153 hg -R repo import |
172 hg -R repo import |
154 put the clone in a subdir - having a directory named "a" |
173 put the clone in a subdir - having a directory named "a" |