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

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

From: <kfogel_at_collab.net>
Date: 2003-07-28 17:53:21 CEST

Shlomi Fish <shlomif@vipe.stud.technion.ac.il> writes:
> Well, I did not receive any reply in the previous send but I'm still
> interested in resolving this issue. So, people, please comment.
> Regards,
> Shlomi Fish
> 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?

I thought that 'svn merge' just did the equivalent of 'svn add' when
it creates a new file, which makes me wonder why 'svn diff' is not
behaving correctly on it. For example:

   $ svn add foo
   A foo
   $ svn diff foo
   Index: foo
   --- foo (working copy)
   +++ foo (working copy)
   @@ -0,0 +1 @@
   +This is the only line in the file 'foo'.

Does merge merely place the raw file in the working copy, but leave it
unversioned? That seems odd, although I'm sure we had a reason for it
at the time...

If that turns out to be deliberate, then your solution (2) seems the
best to me. But let's figure out why merge is behaving the way it
does, first...

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 18:49:29 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.