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

Shlomi Fish <shlomif@vipe.technion.ac.il> writes:

> OK. Should it be an empty text-base or a text-base with the contents of
> the file?
>
> If it's empty then svn diff will work correctly. I don't know why it
> should be full.

No, it should be a real, full text-base.

'svn diff' already notices when a file is schedule-add. If the file
is *also* locally modified, it will compare working file
vs. text-base. Otherwise, the text-base will be ignored, and the
working file will be compared to an empty stream. All of this
behavior already exists in 'svn diff'. (To witness it, try 'svn cp wc
wc', and run 'svn diff').

So the only thing you need to do here is make sure 'svn cp URL wc'
results in the exact same state as 'svn cp wc wc'. And that means a
full text-base is present.

---------------------------------------------------------------------
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:43:43 2003