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

On Wed, 30 Jul 2003, Philip Martin wrote:

> 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.

Oh, OK.

> Is svn_wc_add really the right
> place to do this?

I don't know, I just work here.

> At some point earlier in the copy/merge the
> pristine text-base was retrieved from the repository.
>

Interesting. Where?

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

Oh. How do I retrieve that as well?

Regards,

        Shlomi Fish

>

----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/

An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.

        Falk Fish

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 30 19:42:14 2003