On Fri, Jun 04, 2010 at 06:02:52PM -0700, Lamar Goddard wrote:
> [[[
> Fixes issue #3292: Output svnlook diff content for copied/moved directories
>
> * subversion/svnlook/main.c
> (print_diff_tree): If diff isn't outputted but header has content,
> output the header.
> ]]]
Hi Lamar,
thanks for the patch. It is perferectly fine technically,
but I'm unsure about how we (Subversion developers) want 'svnlook diff'
to behave.
svnlook diff in 1.4 behaves differently than svn diff does in trunk.
svn diff never shows anything for directories (copied or not), it only shows
diffs for files. Do we want svn diff and svnlook diff behave the same way?
If so, maybe the 1.5/1.6 behaviour is correct and the 1.4 behaviour was wrong?
Assuming we do want to show a Copied: header for copied directories in
svnlook diff, why aren't we also showing an Added: header for added
directories, and a Deleted: header for deleted directories?
Stefan
> Index: subversion/svnlook/main.c
> ===================================================================
> --- subversion/svnlook/main.c (revision 951625)
> +++ subversion/svnlook/main.c (working copy)
> @@ -1087,6 +1087,11 @@
> }
> SVN_ERR(svn_cmdline_fflush(stdout));
> }
> + else if (header->len != 0)
> + {
> + /* Print diff header. */
> + SVN_ERR(svn_cmdline_printf(pool, "%s", header->data));
> + }
>
> /* Make sure we delete any temporary files. */
> if (orig_path)
>
>
>
> --
> Lamar Goddard
> lamargoddard_at_gmail.com
Received on 2010-06-09 10:12:00 CEST