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

implementing diff_summarize_repos_wc for dirs_same_p() -- was: Re: tree-conflicts: dirs_same_p()

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Fri, 03 Oct 2008 02:43:10 +0200

Neels J. Hofmeyr wrote:
>
> Julian Foad wrote:
>> On Thu, 2008-09-25 at 23:38 +0100, Julian Foad wrote:
>> A similar but better way of doing this, is to extend do_diff_summarize()
>> to support repos<->wc diffs, and then use it. It's a better way because
>> that would be a very useful API for clients like Subclipse and Tortoise.
>
> I'm giving that a try, at first glance it looks like much of a copy-paste.

Here's the current state of my patch that implements dirs_same_p() by
enhancing do_diff_summarize() and calling svn_client_diff_summarize2().

Except for the tests, it's almost completely different to the previous patch
version, dirs_same_p-3.patch.

Test results (merge_tests.py)
 123 first half PASS, second half FAIL (failure to see local mods)
 124 PASS
 125 XPASS

I'm still onto the second half of 123, but I'd like to show this patch
around in case someone can tell me why my diff_summarize against a locally
modified working copy doesn't do what it should.

Thanks,
~Neels

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-10-03 02:44:46 CEST

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