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

Odd "diff" behavior

From: Augie Fackler <durin42_at_gmail.com>
Date: Sun, 23 Mar 2008 16:50:59 -0500

I was setting up ReviewBoard the other day, and I noticed that a diff
of a merge operation doesn't include files added by the merge. As an
example ($PWD is a branches/1.5.x working copy):
$ svn merge -r29788:29789 http://svn.collab.net/repos/svn/trunk
--- Merging r29789 into '.':
A notes/wc-2.0-design
$ svn st [03/23/08 4:47PM]
  M .
A + notes/wc-2.0-design
$ svn diff

Property changes on: .
Modified: svn:mergeinfo
    Merged /trunk:r29789

Which seems wrong to me. If I did a normal add of the file, it would
show up in the diff. Is my expectation of seeing the added file in the
diff wrong? The big thing to me is that there's no evidence at all
from the diff output that there was an added file.


  • application/pkcs7-signature attachment: smime.p7s
Received on 2008-03-23 22:59:12 CET

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