Re: Resend: Issue #1297: `svn diff' after `svn merge' that adds a file fails

Philip Martin <philip@codematters.co.uk> writes:
> Merge doesn't do 'svn add' it does 'svn copy' to get copyfrom history.

Thanks.

> There is a comment in libsvn_wc/diff.c:file_diff
>
> /* If the item is schedule-add *with history*, then we don't want to
> see a comparison to the empty file; we want the usual working
> vs. text-base comparision. */
> if (copied)
> schedule = svn_wc_schedule_normal;
>
> I don't remember writing that bit, perhaps someone else put it in.

Hmm, that still begs the question, then, because _some_ text base
ought to be there, no?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 19:11:14 2003