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

Re: How to display the code in my branch without merge changes?

From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Tue, 15 Oct 2013 16:20:02 +0100

On 15/10/13 15:14, Andrew Reedick wrote:
>
>
>> -----Original Message-----
>> From: Alfred Perlstein [mailto:bright_at_mu.org]
>> Sent: Tuesday, October 15, 2013 9:55 AM
>> To: Gabriela Gibson; John Maher
>> Cc: users_at_subversion.apache.org
>> Subject: Re: How to display the code in my branch without merge changes?
>>>
>>> ...snip...
>>>
>>>
>> If you are fully up to date with merges, then you should just be able to
>> diff against trunk. That should show you the differences between your
>> branch and the trunk (net changes).
>
> And if you aren't fully up to date, you can use a peg revision to limit trunk to the last merge, e.g. if r100 was the last merge to branch, and trunk is now at r999, then "svn diff ^/trunk_at_100".
>
>
Many thanks to everyone for the help,

svn diff ^/subversion/trunk_at_1531612
^/subversion/branches/invoke-diff-cmd-feature

finally hit the spot! :)

Gabriela
Received on 2013-10-15 17:19:18 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.