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

Re: Adapting "client diff" to compare a WC dir against a repos dir

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 2 Sep 2008 13:39:49 -0700

2008/9/1 Julian Foad <julianfoad_at_btopenworld.com>:

> Does this attempt look like a sane way to determine whether a WC
> directory tree is the same as a repos directory tree?
> This is for the tree-conflict case where a merge wants to delete a dir,
> but first wants to know whether this WC dir is identical to the
> merge-left source dir.
> I'm trying again to write a comparison function,
> libsvn_client/merge.c:dirs_same_p(). This attempt uses some of the guts
> of repos_wc_diff() from libsvn_client/diff.c. Note that diff "summarize"
> would be doing much the same as this - retrieving minimal info on the
> differences - but is not implemented for repos:WC diffs. It looks like I
> can do it this way. The sheer number of access batons and callbacks and
> editors and things needed to set up this comparison is a bit daunting
> for me, but if it sounds reasonable I will plug in all the bits I can
> find and see if it works.
> Any comments gratefully received.

This is a side comment I suppose. In the run-up to 1.5, I discovered
that WC-Repos diffs are not supported by diff --summarize, as you
pointed out. I asked around and no one seemed to think there was a
specific reason why. It would be extremely useful in Subclipse if
this worked. I am sure other GUI clients too. This is a common thing
users want to do -- such as compare the WC with some tag. We
currently have to download every single file and compare them locally
( to do a graphical compare anyway ). So if diff --summarize would
help your problem, then please, please choose that option.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-02 22:40:02 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.