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

Ben Collins-Sussman <sussman@collab.net> writes:
> Yeah, that's the core problem with this bug. The main question is:
> "how did this file get into a schedule-add-with-history state?"
>
> When that code was written (possibly by me, long ago??) the author was
> *only* thinking about the 'svn cp wc wc' case. In that scenario, the
> text-base *does* exist, I believe. But the other possibility is 'svn
> cp URL wc', where there's no text-base. Whoops. This is the command
> that 'svn merge' runs.

So if we fix that merge bug, then #1297 goes away?

Shlomi, want to make 'svn merge' create text bases for added files? :-)

---------------------------------------------------------------------
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:35:13 2003