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

Re: [PATCH] svn diff --summarize changed to show left and right revision numbers

From: Troy Curtis Jr <troycurtisjr_at_gmail.com>
Date: Wed, 03 Jan 2018 02:07:53 +0000

On Tue, Jan 2, 2018 at 7:03 AM Branko Čibej <brane_at_apache.org> wrote:

> On 02.01.2018 13:43, Nagy Peter wrote:
>
> > It only shows that the two are not the same, but nothing more. If I
> change the left and right side,
> > the output also changes, as follows:
> > svn diff --summarize --ignore-properties https://<repo>/DB/tags/v_1.0
> https://<repo>/DB/trunk
> > M https://<repo>/DB/tags/v_1.0/workflow.sql
>
> Of course the output changes, because you asked a different question.
>
> > What i want:
> > svn diff --summarize --ignore-properties https://<repo>/DB/trunk
> https://<repo>/DB/tags/v_1.0
> > M workflow.sql |
> 1015 | 1002 |
> >
> > So that one can see the workflow.sql has been most probably changed in
> the trunk, (because it has a higher revision number) so it is a normal
> development scenario.
>
> This looks like you're using the wrong tool for the job. The answer to
> "what changed on trunk" is given by "svn log", not "svn diff". Diff
> compares two trees in the repository; log gives you the history.
>
> > But if i would see a higher revision number at the tag, i would know,
> that somebody made changes on the tag (which is not recommended, but people
> do such things)
> > so i have to merge the changes back into the trunk.
>
>
Additionally what you are saying is not necessarily correct, but given this
output would likely be the typical user interpretation. As Brane said,
diff compares two trees and then displays the differences. Just because
the revision number is different, does not necessarily mean there is a
meaningful relationship between the revisions just looking at the number.
For instance, if the normal flow is expected periodically merge trunk to a
feature branch, but both lines of development have changes to a file, the
revision numbers could actually be reversed. All it takes is someone
making a change first on trunk, then someone else changing the file on the
branch. Now when you do a diff you assume that the branch side has the
meaningful the change (as it is a later revision number).

I certainly see where you are coming from with this request, to easily see
the last changed revision of the file containing differences. However, I
think it is more likely to confuse the issue than just using the existing
tools to answer each specific question (as Brane suggests).

-- Troy

> For that you could also use 'svn merge --dry-run' or 'svn mergeinfo'.
>
> -- Brane
>
>
Received on 2018-01-03 03:08:13 CET

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