A with hat in german text: Starten Sie "svn cleanup" falls unterbrochen

2013-10-15 Thread Niemann, Hartmut
Hello! There seems to be a typo in a message that tortoiseSVN displays; Stefan Küng claims that the text comes from the subversion core but I did not succeed with the translation tool that Stefan pointed me to. How can we get rid of this A-with-hat in a German text? Is this a UTF8-ANSI recodin

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 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? > > > > ...snip... > > > > > If yo

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? .

Fwd: using Depth value

2013-10-15 Thread Alexander Chelyadin
Hi Subversion Team We are developing an application that uses Subversion client libraries. We have the following issue. When we use the 'svn_client_status3' function and get the 'svn_wc_status2_t::entry' stucture, its 'depth' field sometimes set incorrectly as we suppose. It occurs when we perform

svn writing negative pointers

2013-10-15 Thread Jonathan Coxhead
Hi all I'm seeing the problem described here http://ios-dev.gravitini.com/2012/12/repairing-corrupt-svn-revisions-with.html I went into my repo and fixed it, but another checkin has created another instance of the same problem. It's a royal nuisance! Is there a fix? I'm using a Mac, OS

Re: svn writing negative pointers

2013-10-15 Thread Thorsten Schöning
Guten Tag Jonathan Coxhead, am Mittwoch, 16. Oktober 2013 um 01:05 schrieben Sie: >    I went into my repo and fixed it, but another checkin has > created another instance of the same problem. Which protocol do you use to server your repos? From what I've read the problem only occurs using http,