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

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

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 01 Sep 2008 22:50:44 +0100

Anyone,

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.

- Julian

p.s. I hate showing you unfinished uncompilable code, but if anybody
says "No, do X instead" or "Yes, that's probably the best way," it will
be worth it.

---------------------------------------------------------------------
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-01 23:51:05 CEST

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