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

Re: [PATCH] Issue #1093: make diff follow history

From: Josh Pieper <jjp_at_pobox.com>
Date: 2004-05-12 04:20:21 CEST

Ben Collins-Sussman wrote:
> Josh Pieper wrote:
> >Yes, but that is only half the problem. If the file itself is
> >renamed, the update driver always issues a complete removal of the old
> >file, which causes the diff output to be less than useful.
>
> Hold on: svn_repos_dir_delta() is the ultimate driver of all editors,
> if you trace back far enough in any stack. My memory tells me that it
> has a mode which tells it to "be stupid", i.e. ignore ancestry. For
> example, when you pass the --ignore-ancestry switch to 'svn merge', it
> will never delete and re-add something; it just does ignorant
> path-based comparisons.
>
> Or is the problem completely unrelated to ancestry?

I think the problem is definitely related to ancestry. The editor
driven by the ra function do_update does seem to ignore ancestroy.
From my investigation, the editor for updates seems to be driven by
the reporter code, not by svn_repos_dir_delta. The reporter code
doesn't seem to pay attention to ancestry AFAICT.

-Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 12 04:22:08 2004

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