Re: svn writing negative pointers
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, maybe even only with neon. Using svn-protocol may be a workaround then. https://groups.google.com/forum/#!topic/tortoisesvn/6J7PNez2i-c Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
svn writing negative pointers
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 X Mountain Lion (12F45) and subversion 1.7.10 (r1485443). I don't subscribe to this list, so could replies be CC'd to me, please? Thanks —Jonathan Coxhead
Fwd: using Depth value
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 'update' on the folders with the 'svn_depth_immediates' depth and get the new folders from repository to wc. For those new folders real depth seems to be ' svn_depth_empty' as it is expected (and it behaves like that as well), but when we call the 'svn_client_status' API function we get the 'svn_depth_infinity' value for this new directory in the 'svn_wc_status2_t::entry' structure. Does it look like a bug, or we do not clearly understand this behavior? Could you please clarify the situation? We are using Subversion 1.7.5, but issue appears on 1.8.3.9248 version as well. Thank you in advance. Best regards, Alexander Chelyadin
Re: How to display the code in my branch without merge changes?
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? ...snip... If you are fully up to date with merges, then you should just be able to diff against trunk.That should show you the differences between your branch and the trunk (net changes). And if you aren't fully up to date, you can use a peg revision to limit trunk to the last merge, e.g. if r100 was the last merge to branch, and trunk is now at r999, then "svn diff ^/trunk@100". Many thanks to everyone for the help, svn diff ^/subversion/trunk@1531612 ^/subversion/branches/invoke-diff-cmd-feature finally hit the spot! :) Gabriela
RE: How to display the code in my branch without merge changes?
> -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 you are fully up to date with merges, then you should just be able to > diff against trunk.That should show you the differences between your > branch and the trunk (net changes). And if you aren't fully up to date, you can use a peg revision to limit trunk to the last merge, e.g. if r100 was the last merge to branch, and trunk is now at r999, then "svn diff ^/trunk@100".
Re: How to display the code in my branch without merge changes?
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 mean a version BEFORE the merge? You can pass a revision to the diff command to get the one you want. I want just the current 'net' code I wrote into my branch, minus the merge changes and various versions I tried in the process, ie, a neat version of what diff -r ~/trunk/subversion/ ~/branches/invoke-diff-cmd-feature/subversion/ would show me, supposing that I just have merged the trunk into the branch. So, branch - trunk = net code. I've merged the trunk into the branch a few times now in order to keep it up to date so there is no revision that I could go back to. thanks, Gabriela If you are fully up to date with merges, then you should just be able to diff against trunk.That should show you the differences between your branch and the trunk (net changes). -- Alfred Perlstein
Re: How to display the code in my branch without merge changes?
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 revision to the diff command to get the one you want. I want just the current 'net' code I wrote into my branch, minus the merge changes and various versions I tried in the process, ie, a neat version of what diff -r ~/trunk/subversion/ ~/branches/invoke-diff-cmd-feature/subversion/ would show me, supposing that I just have merged the trunk into the branch. So, branch - trunk = net code. I've merged the trunk into the branch a few times now in order to keep it up to date so there is no revision that I could go back to. thanks, Gabriela
RE: How to display the code in my branch without merge changes?
> 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 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.)
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.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 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
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
A with hat in german text: Starten Sie "svn cleanup" falls unterbrochen
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 recoding issue? Mit freundlichen Grüßen Dr.Hartmut Niemann > -Ursprüngliche Nachricht- > Von: Stefan Küng [mailto:tortoise...@gmail.com] > Gesendet: Samstag, 12. Oktober 2013 10:01 > An: us...@tortoisesvn.tigris.org > Betreff: Re: A with hat in german text: Starten Sie "svn cleanup" falls > unterbrochen > > On 11.10.2013 15:58, Niemann, Hartmut wrote: > > There seems to be a typo (illegal character Â) in this message: > > > > Error: Die vorhergehende Operation wurde nicht abgeschlossen; Starten > > Sie »svn > > > > Error: cleanup« falls sie unterbrochen wurde > > > > Error: Please execute the 'Cleanup' command. > > > > Completed!: > > That message is returned by the svn library. So changing/fixing that > translated string requires doing so in the svn project: > > https://translate.apache.org/de/Subversion/translate.html > > Stefan > > -- > ___ >oo // \\ "De Chelonian Mobile" > (_,\/ \_/ \ TortoiseSVN > \ \_/_\_/>The coolest interface to (Sub)version control > /_/ \_\ http://tortoisesvn.net > > -- > http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessag > eId=3066206 > > To unsubscribe from this discussion, e-mail: [users- > unsubscr...@tortoisesvn.tigris.org].
