Re: [Quilt-dev] [patch] Error in output for deleted file w/timestamps enabled

[Andreas Gruenbacher]

Added, thanks!

On Mon, 2004-08-30 at 08:02, James Rowe wrote:
> From: James Rowe <address@hidden>
> Severity: Minor
> Status: Done
> Section: !avail
> Conflicts: cvs_style_-m-F_options.patch, replace-backup_files-pdelta.patch
> Closes: #498149
> 
>   With timestamps enabled new_date can be incorrectly set if new_file is
> /dev/null.  For example, when diff'ing a file which has been deleted the 
> output
> will be: 
> 
> x     Index: test/test
> x     ===================================================================
> x     --- test.orig/test      2004-07-19 16:34:12.823541788 +0100
> x     +++ /dev/null1970-01-01 00:00:00.000000000 +0000
> x     @@ -1 +0,0 @@
> x     -Example
> 
> ---
> 
>  patchfns.in |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)$
> 
> --- quilt-0.35/scripts/patchfns.in    2004-07-15 23:02:46.000000000 +0100
> +++ quilt-0.35/scripts/patchfns.in    2004-08-30 05:17:42.805031160 +0100
> @@ -532,7 +532,7 @@ diff_file()
>               new_file=/dev/null
>               new_hdr=/dev/null
>               [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
> -             || new_date="1970-01-01 00:00:00.000000000 +0000"
> +             || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
>       else
>               [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
>               || new_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \

Cheers,
-- 
Andreas Gruenbacher <address@hidden>
SUSE Labs, SUSE LINUX AG