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

Re: diff summarize with wc path (was Re: [PATCH] svn diff --summarize)

From: Martin Hauner <martin.hauner_at_gmx.net>
Date: 2006-02-09 22:37:48 CET

Julian Foad wrote:
> Martin Hauner wrote:
>> Julian Foad wrote:
>> >> $ svn diff --summarize
>> >> svn: Summarizing diff can only compare repository to repository
>> >
>> > That might be considered an annoying limitation (of the API).
>[..]
>> Anyway, how would the rep<->wc case look like?
>
> Do you mean the command syntax?
>
> svn diff --summarize -r100 wc/
>
> Or the output? Just like the -rX:Y summary output.
>
> Or the implementation? See below.

Yep, implementation.

>[..]
>> Maybe ignoring the local modifications and just doing the rep<->base
>> would be near enough?
>
> No: a rep<->base diff would be useful, but it wouldn't be near enough to
> a rep<->WC diff to call it a rep<->WC diff.
>
>> Thoughts?
>
> Step 1: Allow X:BASE and BASE:Y summaries. This is easy: just resolve
> "BASE" to the actual number; "COMMITTED" and "PREV" are already
> supported in this way.

That is the easy part..

> Step 2: Implement a BASE:WC summary, performed without repository
> access. The API should also allow WC:BASE, though the user interface
> doesn't. As a hack to get this working, this could perhaps just call
> the full diff and discard the data.

I don't like the hack idea. I started on the summarize stuff
because i didn't want to extract the summary from the diff output. :)

> Step 3: Allow X:WC and WC:Y summaries, probably by combining the info
> from (1) and (2).

 From what Malcome wrote in his reply (mixed revisions, diff problems)
this looks complicated.

And it gets more complicated: assume REVISION:BASE is different for
an item and BASE:WC is different too. REVISION:WC could be equal if
the WC changes revert the REVISION:BASE differences. We would have to
look at the actual diffs to decide if the item is changed or not.

-- 
Martin
Subcommander, http://subcommander.tigris.org
a cross platform Win32/Unix/MacOSX subversion gui client & diff/merge tool.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 9 22:39:45 2006

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