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

'svn diff' on A+ file

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-03 18:44:36 CEST

In my working copy, I did an 'svn cp foo.c bar.c'.

As expected, the text-base got copied as well, and 'svn status' now
describes bar.c as scheduled for addition-with-history:

A + bar.c

Then I started making changes to bar.c, and wanted to see them.

When I run 'svn diff bar.c', our diff logic says, "oh, the file is
scheduled for addition, so it must be new, so I'll compare it to the
empty file." And then I see the entire file contents spewed.

But I'd really like to see just my local changes.

One solution would be to tweak our diff logic: if the file is
schedule-add *with history*, then compare working file vs. text-base,
as usual. We might even be able to put some extra commentary in the
diff output as well, explaining that "the whole file is being added to
the repository, but here are your local changes."

Is this a contentious proposition? Anyone have problems with this? I
could file a bite-sized issue.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 3 18:45:51 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.