On 13/10/13 15:15, Lieven Govaerts wrote:
Hi Lieven,
The last time you updated the invoke-diff-cmd branch from trunk was in
rr1526487, you updated from trunk r1526439.
Sorry, I had merged locally but not committed. (done now)
So if you compare your branch to trunk@1526439 you will get a diff file
with only your changes. No?
$ svn diff -x -pwb ^/subversion/trunk@1526439
^/subversion/branches/invoke-diff-cmd-feature
Previously I got all the merge changes, without seeing any of mine at
all. And now that it's been re-merged (I reverted and started over) &
committed, I get nothing at all. But:
diff -r ~/trunk/subversion/
~/branches/invoke-diff-cmd-feature/subversion/
shows me all my changes as expected.
Yet, this:
svn diff -x -pwb /home/g/trunk/
/home/g/branches/invoke-diff-cmd-feature/
shows me nothing at all (before it showed me what the merge added
from trunk, but none of my changes). For some reason, the ^ expansion
does not work on my system so I use a full path here.
thanks,
Gabriela
ps.: I attached a file with my shell session, just in case I'm not
seeing the obvious (as per usual!)
pps.: this by now it probably a svn-user discussion, and so I
apologise to the dev list. I'm not sure, but should we continue this
thread on svn-user?
$ cd ~/trunk
~/trunk>
$ svn diff -x -pwb /home/g/trunk/ /home/g/branches/invoke-diff-cmd-feature/
~/trunk>
$ cd ~/branches/invoke-diff-cmd-feature
~/branches/invoke-diff-cmd-feature>
$ svn diff -x -pwb /home/g/trunk/ /home/g/branches/invoke-diff-cmd-feature/
~/branches/invoke-diff-cmd-feature>
$ diff -r --brief ~/trunk/subversion/
~/branches/invoke-diff-cmd-feature/subversion/ | grep -v Only
Files /home/g/trunk/subversion/include/svn_client.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/include/svn_client.h differ
Files /home/g/trunk/subversion/include/svn_config.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/include/svn_config.h differ
Files /home/g/trunk/subversion/include/svn_error_codes.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h
differ
Files /home/g/trunk/subversion/include/svn_io.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h differ
Files /home/g/trunk/subversion/libsvn_client/deprecated.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_client/deprecated.c
differ
Files /home/g/trunk/subversion/libsvn_client/diff.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c differ
Files /home/g/trunk/subversion/libsvn_subr/config_file.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/config_file.c
differ
Files /home/g/trunk/subversion/libsvn_subr/io.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c differ
Files /home/g/trunk/subversion/libsvn_subr/io.c~ and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c~ differ
Files /home/g/trunk/subversion/libsvn_wc/wc-queries.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/libsvn_wc/wc-queries.h
differ
Files /home/g/trunk/subversion/svn/cl.h and
/home/g/branches/invoke-diff-cmd-feature/subversion/svn/cl.h differ
Files /home/g/trunk/subversion/svn/diff-cmd.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/svn/diff-cmd.c differ
Files /home/g/trunk/subversion/svn/log-cmd.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/svn/log-cmd.c differ
Files /home/g/trunk/subversion/svn/svn.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/svn/svn.c differ
Files /home/g/trunk/subversion/svnlook/svnlook.c and
/home/g/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c differ
Files /home/g/trunk/subversion/tests/cmdline/diff_tests.py and
/home/g/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/diff_tests.py
differ
Files /home/g/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test and
/home/g/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_fs/fs-pack-test
differ
~/branches/invoke-diff-cmd-feature>
$ svn info
Path: .
Working Copy Root Path: /home/g/branches/invoke-diff-cmd-feature
URL:
https://svn.apache.org/repos/asf/subversion/branches/invoke-diff-cmd-feature
Relative URL: ^/subversion/branches/invoke-diff-cmd-feature
Repository Root: https://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 1531702
Node Kind: directory
Schedule: normal
Last Changed Author: gbg
Last Changed Rev: 1531702
Last Changed Date: 2013-10-13 17:10:59 +0100 (Sun, 13 Oct 2013)
~/branches/invoke-diff-cmd-feature>
$ cd -
/home/g/trunk
~/trunk>
$ svn info
Path: .
Working Copy Root Path: /home/g/trunk
URL: https://svn.apache.org/repos/asf/subversion/trunk
Relative URL: ^/subversion/trunk
Repository Root: https://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 1531712
Node Kind: directory
Schedule: normal
Last Changed Author: brane
Last Changed Rev: 1531612
Last Changed Date: 2013-10-13 02:45:33 +0100 (Sun, 13 Oct 2013)
~/trunk>
$
