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

"Sander Striker" <striker@apache.org> writes:
> > So if we fix that merge bug, then #1297 goes away?
>
> The svn copy 'bug' you mean? When doing a copy, there should be a textbase
> afterwards, agreed?
>
> > Shlomi, want to make 'svn merge' create text bases for added files? :-)
>
> The merge code just uses the copy code. Fix that and these bugs will go
> away.

Sorry, that's what I should have said, yes.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 22:13:48 2003