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

Re: svn commit: r17234 - in trunk/subversion: libsvn_wc

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2005-11-09 11:07:19 CET

On Tue, Nov 08, 2005 at 02:17:34PM -0600, kfogel@collab.net wrote:
> malcolm@tigris.org writes:
> > Log:
> > Ensure that local property modifications aren't reported during diffs to
> > BASE, by reporting against the BASE properties rather than the WORKING
> > properties.
>
> I had trouble understanding this log message. Did you mean to say
> "are" rather than "aren't"? Or is there something deeper I'm missing?
>
> I would think that local property modifications *should* be reported
> during diffs against BASE, and that the clause following the comma in
> your above paragraph describes how one would make that happen.
>

Sorry, that wasn't too clear, was it? I've updated the log message now,
and hopefully it makes more sense. (Let me know if you think it still
needs work, anyway).

libsvn_wc/diff.c deals with diffs using the working copy as a target:
either repos-wc diffs (rN to either BASE or WORKING) or wc-wc diffs
(which are always BASE to WORKING). In the case of repos-wc diffs,
we can also request that the whole diff be reversed, so we can use it
to produce a wc-repos diff as well.

The 'use_text_base' option is used to indicate whether the target wc
revision is BASE (which it can only be in repos-wc diffs).

The problem here was that you could do:

$ svn diff -rN:BASE wc
$ svn ps propname propval wc/foo
$ svn diff -rN:BASE wc

and the second diff would show the property change, which surely wasn't
intended.

Regards,
Malcolm

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 9 11:08:09 2005

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