diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-06-21 22:50:41 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-06-21 22:50:41 +0000 |
commit | 704cc62b1cfdd1f9e37f51ffef4ad28920b8a06b (patch) | |
tree | 9acf99348706f9e2ae9b66800e91f73a8088aa23 | |
parent | 9a4bdee07217cf5b04aeded5f462ed3728b8a3d9 (diff) | |
download | quilt-704cc62b1cfdd1f9e37f51ffef4ad28920b8a06b.tar.gz |
- Actually, ed-style diffs are really needed for this to work.
-rw-r--r-- | quilt/annotate.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/quilt/annotate.in b/quilt/annotate.in index e3ac44f..6e48a2d 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -126,10 +126,11 @@ template=$(gen_tempfile) # is created based on a file that contains the same number of lines as # the source file, but all lines are empty. # -# Then, for each patch that modifies the source file, a diff without -# context is generated (-U0 or -C0 would do, but I've picked -e). In -# that diff, all line additions are replaced with the identifier of the -# patch (1, 2, ...). These patches are then applied to the empty file. +# Then, for each patch that modifies the source file, an ed-style diff +# (which has no context, and removes lines that are removed without +# caring for the line's contents) is generated. In that diff, all line +# additions are replaced with the identifier of the patch (1, 2, ...). +# These patches are then applied to the empty file. # # Finally, the annotations listing is merged with the source file line # by line. |