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

Can you explain what you mean by "current version". When you merge from the trunk you change the current version. So the current version and all versions afterward include the merged changes. Do you mean a version BEFORE the merge? You can pass a revision to the diff command to get the one you want.

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
Received on 2013-10-15 14:25:21 CEST