[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Show more information in diff labels in mailer.py

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2006-09-19 11:19:49 CEST

On 9/19/06, Mathias Weinert <wein@mccw.de> wrote:
> Okay, so let's use
> --- file1 r5 Sun Sep 9 15:40:00 2001 (original)
> +++ /dev/null 00:00:00 1970 (empty, because file is deleted)
> for deleted files.
>
> Putting all arguments together I suggest
> - to change the output of mailer.py's diff as already proposed in
> an earlier post
> - accept that options -T and -Z may not work properly (which doesn't
> make so much sense IMHO because when patching a wc file it should get
> a new timestamp)

I strongly disagree. -T should continue to work if the user wants it
- especially when there's no legitimate reason for us to break the
unified diff format here. Diff analysis tools will want to parse the
date from the header info - this would break them for no particular
reason.

So, instead of:

+++ file2 r1 Sun Sep 9 01:46:40 2001

(Patch seems to interpret 'r1' as 00:00 of the current day.)

An acceptable compromise would be:

+++ file2 Sun Sep 9 01:46:40 2001 (r1)

Put the revnum and anything else in parens after the datestamp; but it
must be filename tab datestamp - whatever comes after the datestamp is
free form text. But, we can not put random stuff in the middle of the
unified diff format.

FWIW, my suggestion works fine with GNU patch and -T - so it should be
parsable by most diff analysis tools that work off mail archives. --
justin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 19 11:20:06 2006

This is an archived mail posted to the Subversion Dev mailing list.