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

RE: 'svn diff' on A+ file

From: Sander Striker <striker_at_apache.org>
Date: 2003-04-03 18:49:44 CEST

> From: sussman@collab.net [mailto:sussman@collab.net]
> Sent: Thursday, April 03, 2003 6:45 PM

> 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.

Exactly.
 
> 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.

+1.

> 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?

Nah

> Anyone have problems with this?

I certainly hope not...

> I could file a bite-sized issue.

Do it!

Sander

---------------------------------------------------------------------
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:50:30 2003

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