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

Re: tree-conflicts: dirs_same_p()

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Sat, 27 Sep 2008 04:31:26 +0200

Julian Foad wrote:
> On Thu, 2008-09-25 at 23:38 +0100, Julian Foad wrote:
>> Neels, this didn't ever work. This is me having started to port some of
>> the diff code into this new "dirs_same_p" function. I haven't finished
>> it. I forgot to initialise "target", as you've discovered. There are,
>> I'm quite sure, other things I haven't yet initialised or coded in this
>> function.
> I copied most of the code in this dirs_same_p from
> diff.c:diff_repos_wc(). You might do better to look at that yourself and
> figure out how to write something like it, rather than starting from my
> attempt where I can't tell you which parts I think I've done right and
> which I haven't.
> 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.

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-09-27 04:31:58 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.