Mercurial > hg > mercurial-crew
comparison tests/test-import.out @ 10883:196908117c27 stable
patch: don't look for headers in diff lines
If you have a diff line that matches a header line, the patch splitter
currently breaks your patch at this line. For example a line like:
+key: value
This can lead to "malformed patch" exceptions. Now fixed.
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Fri, 09 Apr 2010 20:34:05 +0200 |
| parents | fb06e357e698 |
| children | 4fb1bafd43e7 |
comparison
equal
deleted
inserted
replaced
| 10878:c63a6ddbbf9a | 10883:196908117c27 |
|---|---|
| 371 +perforce does not maintain empty directories. | 371 +perforce does not maintain empty directories. |
| 372 +this file helps. | 372 +this file helps. |
| 373 diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash | 373 diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
| 374 old mode 100644 | 374 old mode 100644 |
| 375 new mode 100755 | 375 new mode 100755 |
| 376 % diff lines looking like headers | |
| 377 adding a | |
| 378 adding b | |
| 379 adding c | |
| 380 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 381 applying patch from stdin |