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

Re: diff of scheduled copies

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2004-09-09 04:32:42 CEST

On Sep 4, 2004, at 5:15 AM, Folker Schamel wrote:

> "what I have typed (text and props)"
> = svn diff
> "show me what I'm about to do (text and props)"
> = svn status + svn diff
> -> So why a new switch?

"svn status + svn diff" does not show me "what I'm about to do."
Status shows that the files are scheduled for copy, true, but does not
show the content of the files. Diff is all about the file content, but
at present ignores scheduled-copy files (or shows only the changes
since the copy).

A concrete example: in our product, we have this hierarchy of
configuration files: a site-specific one, a user-specific one, and the
default settings (not necessarily in that order). Java properties
files are often handled the same way, and the java Properties class
supports it directly. If I copy in such a file, then the file
contents--the property settings--have effect that I cannot fully
predict merely by seeing the file name. Properties in the copied file
will affect the behavior of the system, even though I have done no
further typing in the files.

If I copy in a file with 20 settings, and change one, then there's a
legitimate question "what's the one thing I changed?", and there's
another equally legitimate question "what are the 20 things I'm about
to change?" None of your proposed combinations can tell me all those
things. "svn status + svn diff + cat" can, but this is too much work.

Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835.8090

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 9 04:33:18 2004

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.