You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Shlomi Fish <sh...@vipe.stud.technion.ac.il> on 2003/07/25 11:26:22 UTC

Issu #1297: `svn diff' after `svn merge' that adds a file fails

Check:

http://subversion.tigris.org/issues/show_bug.cgi?id=1297

According to my analysis the problem is that
wc/branch/.svn/text-base/newfile.svn-base does not exist. The question is
what should be done:

1. Make svn merge create an empty file there.

2. Make svn diff take the non-existence of a file in text-base/ to be
counted as an empty file.

3. Something else?

Regards,

	Shlomi Fish

----------------------------------------------------------------------
Shlomi Fish        shlomif@vipe.technion.ac.il
Home Page:         http://t2.technion.ac.il/~shlomif/

An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.

	Falk Fish

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