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

> -----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".
Received on 2013-10-15 16:16:30 CEST