[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Shlomi Fish <shlomif_at_vipe.stud.technion.ac.il>
Date: 2003-07-25 13:26:22 CEST



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?


        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
Received on Fri Jul 25 13:27:15 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.