On Thu, Nov 25, 2010 at 12:08:41AM +0530, Kamesh Jayachandran wrote:
>
> >AFAIK svn diff always prints a diff against the copy source if the
> >items being diffed are source and target of a copy. How is what you
> >intend to do different from the default behaviour?
>
> What Prabhu's '--diff-copy-from' do is 'get the modification to file *alone* done in a same commit as copy'.
>
> Without this switch it would show all the lines as 'added' with this switch it would show only 'the modified lines'.
>
> While debugging some issue I could see 'svnlook diff --diff-copy-from' doing exactly the same and asked Prabhu to do the same.
>
Hi Kamesh,
I don't understand what you mean.
We're probably not talking about the same thing.
I'm talking about this (the file is copied and the copy is modified
before commit):
$ svn cp alpha alpha2
A alpha2
$ vi alpha2
$ svn di alpha2
Index: alpha2
===================================================================
--- alpha2 (working copy)
+++ alpha2 (working copy)
@@ -2,7 +2,6 @@ alpha
1
2
3
-4
5
6
7
$ svn ci -m"copied alpha to alpha2"
Adding alpha2
Transmitting file data .
Committed revision 4.
$ svn di ^/trunk/alpha ^/trunk/alpha2
Index: alpha
===================================================================
--- alpha (.../alpha) (revision 4)
+++ alpha (.../alpha2) (revision 4)
@@ -2,7 +2,6 @@ alpha
1
2
3
-4
5
6
7
As you can see, the copied file is never shown as fully added.
In which situation do you see the file as fully added?
Thanks,
Stefan
Received on 2010-11-25 00:25:20 CET