[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-07-28 19:03:58 CEST

kfogel@collab.net writes:

> I thought that 'svn merge' just did the equivalent of 'svn add' when
> it creates a new file,

Merge doesn't do 'svn add' it does 'svn copy' to get copyfrom history.

There is a comment in libsvn_wc/diff.c:file_diff

  /* If the item is schedule-add *with history*, then we don't want to
     see a comparison to the empty file; we want the usual working
     vs. text-base comparision. */
  if (copied)
    schedule = svn_wc_schedule_normal;

I don't remember writing that bit, perhaps someone else put it in.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 19:05:42 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.