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

> From: Gabriela Gibson [mailto:gabriela.gibson_at_gmail.com]
> Sent: Tuesday, October 15, 2013 7:24 AM
> To: users_at_subversion.apache.org
> Subject: How to display the code in my branch without merge changes?
>
> My goal is to get svn to show the current version of my code,  without the merged changes added from trunk. 
>
> I've tried a lot of different approaches by now (as advertised in svn help diff), but nothing seems to do the trick.
>
> thanks for any advice,
>
> Gabriela

Create a new workspace and unmerge (aka reverse merge) the changes from trunk. Then diff the workspace. (You probably don't want to check-in the reverse merge changes.)
Or
Branch your code before the first trunk merge and cherry-pick merge your items to the new branch (i.e. don't merge over the trunk changes.)

Obviously, if your code relies on, or otherwise interacts with the trunk changes, then you'll have to tweak your code (and will probably go with the new branch option.)
Received on 2013-10-15 15:25:43 CEST