Re: [PATCH] Issue #1297 Fix - Revision 3

Shlomi Fish <shlomif@vipe.stud.technion.ac.il> writes:

> Resolves Issue #1297 ('svn diff' after 'svn merge' that adds a file fails)
> and other misbehaviours. (such as svn diff after a 'svn copy' of file).
>
> * libsvn_wc/adm_ops.c
> (svn_wc_add): if it's an addition of a copied file, then copy its
> contents
> to the text-base.

What about keyword expansion and eol-conversion? The text-base is not
the same as the working copy file. Is svn_wc_add really the right
place to do this? At some point earlier in the copy/merge the
pristine text-base was retrieved from the repository.

What about the prop-base? That's just as important as the text-base.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org