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

svn diff doesn't show added files

From: Carl Gay <cgay_at_itasoftware.com>
Date: Tue, 08 Jan 2008 12:59:41 -0500

[Never got a response to this and don't see it in the archive so
resending. Maybe it makes a difference now that I'm on the list?]

Hi. I created a diff for use with Review Board, a collaborative code review
tool, only to find that some files that were added in my working copy weren't
included in the diff. The scenario is that I have just merged some changes
from the trunk into a branch which resulted in some files being added to a
directory called "data/state-files". No directories were added or removed in
the merge.

If I cd to the branch copy of data/state-files I see this:

$ svn stat
M 1.5-foo-state.coil
D 1.5-foo.pickle
A + 1.4.3-foo.pickle
M 1.5-bar-state.coil
D 1.5-bar.pickle
A + 1.4.3-bar.pickle

$ svn diff | grep 1.4.3

i.e. there is no diff for the 1.4.3 files that were added.

This is confusing me, and I wonder if someone could explain why it is so, or
tell me it's a bug.

Generally when you make a diff you would like someone else to be able to apply
it to the same version of the source and end up with the same result you have
locally. The one reason that I could think of why svn might behave the way it
does (by design) is that if the added files WERE included in the diff and
someone applied them to their sources it wouldn't be exactly equivalent to what
I have locally since the file history isn't carried with the diff. Am I on the
right track? Even so, it seems like including the added files in the diff
would be more useful. Perhaps there could be an option? I've probably missed
something obvious...

svn command line client 1.2.1
(Yes, I know it's old, but I didn't see any open or closed bugs for this.)


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-08 19:02:10 CET

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

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