Justin Erenkrantz wrote:
> 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.
All right, sounds reasonable. That's absolutely okay for me.
So we would have:
Added file:
old: --- (empty file)
+++ dir1/file3 Sun Sep 9 01:46:40 2001
new: --- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dir1/file3 Sun Sep 9 01:46:40 2001 (r1)
Modified file:
old: --- dir2/file5 (original)
+++ dir2/file5 Sun Sep 9 04:33:20 2001
new: --- dir2/file5 Sun Sep 9 01:46:40 2001 (r1, original)
+++ dir2/file5 Sun Sep 9 04:33:20 2001 (r2)
Unchanged copied file:
old: --- file1 (original)
+++ dir2/file7 Sun Sep 9 07:20:00 2001
new: --- file1 Sun Sep 9 01:46:40 2001 (r1, copy source)
+++ dir2/file7 Sun Sep 9 07:20:00 2001 (r3, unchanged copied file)
Copied and changed file:
old: --- file1 (original)
+++ dir3/file8 Sun Sep 9 10:06:40 2001
new: --- file1 Sun Sep 9 01:46:40 2001 (r1, copy source)
+++ dir3/file8 Sun Sep 9 10:06:40 2001 (r4)
Deleted file:
old: --- file2 Sun Sep 9 15:40:00 2001
+++ (empty file)
new: --- file2 Sun Sep 9 15:40:00 2001 (r5, original)
+++ /dev/null 00:00:00 1970 (empty, because file is deleted)
Mathias
---------------------------------------------------------------------
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:37:09 2006