diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-11-28 01:30:16 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-11-28 01:30:16 +0000 |
| commit | f8e5d57fe36843ab92607a3a473c4d52c52b9f07 (patch) | |
| tree | 6d99cabc2ba7cfd16f32790de0be48fa833d7c97 /quilt.changes | |
| parent | 53819365cf8b1dad870cf97a1f33bd7579f6b6ed (diff) | |
| download | quilt-f8e5d57fe36843ab92607a3a473c4d52c52b9f07.tar.gz | |
- Oops, the /dev/null "fix" broke create-delete.test. Back out this change
and fix only the specific -p0 case.
Diffstat (limited to 'quilt.changes')
| -rw-r--r-- | quilt.changes | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/quilt.changes b/quilt.changes index 8c1cecb..b77d45c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,14 +1,11 @@ ------------------------------------------------------------------- Mon Nov 28 01:34:05 CET 2005 - agruen@suse.de -- quilt/diff.in, quilt/refresh.in: stop using /dev/null for added - or removed files: GNU diff does not do that either, and for - removed files this leads to headers that only reference - $file.orig and /dev/null, so the actual file is not found. (This - is only truly fixes -p0 style patches as -p1 style patches use - dir.orig/file instead of dir/file.orig so the filename is not - lost, but stopping to use /dev/null makes sense for -p style - patches just the same. +- quilt/diff.in, quilt/refresh.in: for -p0 style patches, when a + file is being deleted, use the real filename in the +++ line + instead of filename.orig: if we don't, the patch does not + contain the real filename anymore, and patch will fail. See + test/null-bug.test. - files command: remove a redundant find_patch(). - Make top_patch() fail if there is no top patch. |