prop diffs in svn_wc_install_file() (was: svn commit: rev 1228 - trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_subr trunk/subversion/libsvn_ra_local trunk/subversion/libsvn_client trunk/subversion/libsvn_ra_dav)

On Tue, Feb 12, 2002 at 08:50:33PM -0600, Karl Fogel wrote:
> Greg Stein <gstein@lyra.org> writes:
> > Why? If a full proplist is provided, then just install the darned thing. The
> > current code generates diffs between the full set and the current set, and
> > then later applies those diffs to generate the full set.
> >
> > Seems a bit complex :-)
>
> I don't want to put words in Ben's mouth, but I think this is for
> detecting local prop mods. I.e., you have the new full set, and the
> old pristine set, but you still have to discover the differences
> between those two to know if you've got a prop conflict.

Hmm. Then some documentation needs to be updated and/or we don't have the
full set of options:

1) "here are some prop change to apply"
2) "here is a complete list of props; warn me of conflicts"
3) "here is a complete list of props; aply them"

I assumed that the semantics were (1) and (3). You're saying (1) and (2).

Given (2), I can see how a prop diff might be useful. But a simpler scheme
is to apply the proplist and have the pristine and the current set handy
(3-way merge rears its head). Rather than computing a new list, when you
apply each prop in turn, you just check if the prop has changed between
pristine and current. It obviates the need for the whole "compute prop
diffs" stuff.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org