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

2013-10-15 Thread Gabriela Gibson
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

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

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

Re: External diff based on mime-type

2013-04-19 Thread Gabriela Gibson
On 4/19/13, Watson, Paul pwat...@phs.org wrote: We have a diff utility designed for a proprietary file format. I would like for this theappdiff utility to be used if the file's svn:mine-type prop is application/the-app. Hi Paul, as far as I know, this feature is currently not available, but

Re: [OPW] Introducing the 2013 Apache Subversion Intern

2013-02-14 Thread Gabriela Gibson
On 31/01/13 12:54, Nico Kadel-Garcia wrote: On Thu, Jan 31, 2013 at 7:24 AM, Gabriela Gibson gabriela.gib...@gmail.com wrote: Hi everyone, I am the current Gnome Outreach Program for Women intern for the Apache Subversion project, sponsored by Elego, Berlin, Germany. OPW is a GNOME Woman

[OPW] Introducing the 2013 Apache Subversion Intern

2013-01-31 Thread Gabriela Gibson
Hi everyone, I am the current Gnome Outreach Program for Women intern for the Apache Subversion project, sponsored by Elego, Berlin, Germany. OPW is a GNOME Woman initiative that aims to inspire women to contribute to Free Software projects. A short introduction to my official goals for the