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

Re: Presenting net code changes for a branch

From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Sun, 13 Oct 2013 20:29:47 +0100

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_at_1526439 you will get a diff file
> with only your changes. No?
> $ svn diff -x -pwb ^/subversion/trunk_at_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?

Received on 2013-10-13 21:29:12 CEST

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