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

Re: [PATCH] can't "svn patch" working copy root if the patch is in --git format

From: Julian Foad <julianfoad_at_apache.org>
Date: Mon, 09 Jul 2018 17:20:41 +0100

Dmitry Pavlenko wrote on 2018-07-09:
> Note that the patch looks like
>
> Index: /tmp/wc
> ===================================================================
> diff --git a/ b/
> --- a/ (revision 0)
> +++ b/ (working copy)
>
> Property changes on:
> [...]

Thanks for the bug report. I like removing code. Before we commit this, I have a few questions (for anybody who can answer) about how this should be working.

I think the "Property changes on: " line is not right: it should show a dot for the path: "Property changes on: ."

Maybe the "diff --git" line should say "diff --git a/. b/." for consistency (other directory paths printed there do not end with a slash) and clarity. (Would that even make the "svn patch" operation work correctly?)

We could do both fixes: make "svn diff" add a dot, to be more conservative; and also make "svn patch" not require a dot, to be more lenient, and to work with already-generated patches.

- Julian
Received on 2018-07-09 18:20:49 CEST

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