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

2013-10-15 Thread John Maher
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 y

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

2013-10-15 Thread Andrew Reedick
> From: Gabriela Gibson [mailto:gabriela.gib...@gmail.com] > Sent: Tuesday, October 15, 2013 7:24 AM > To: users@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 c

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

2013-10-15 Thread Gabriela Gibson
On 15/10/13 13:24, John Maher wrote: Hi John, 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

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

2013-10-15 Thread Alfred Perlstein
On 10/15/13 6:26 AM, Gabriela Gibson wrote: On 15/10/13 13:24, John Maher wrote: Hi John, 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 mea

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

2013-10-15 Thread Andrew Reedick
> -Original Message- > From: Alfred Perlstein [mailto:bri...@mu.org] > Sent: Tuesday, October 15, 2013 9:55 AM > To: Gabriela Gibson; John Maher > Cc: users@subversion.apache.org > Subject: Re: How to display the code in my branch without merge changes? > > >

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

2013-10-15 Thread Gabriela Gibson
On 15/10/13 15:14, Andrew Reedick wrote: -Original Message- From: Alfred Perlstein [mailto:bri...@mu.org] Sent: Tuesday, October 15, 2013 9:55 AM To: Gabriela Gibson; John Maher Cc: users@subversion.apache.org Subject: Re: How to display the code in my branch without merge changes