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

kfogel@collab.net writes:

>> /* 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?

A wc-to-wc copy will have a text base, but an URL-to-wc copy will not.

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