Repository name not listed in web

2010-09-07 Thread Neson Maxmelbin (RBEI/EMT5)
Hello Guys, I have multiple repositories configures using SVNParentPath. The problem I have is that in the web client, in the main page of the repository , the name of the repository is not listed. The value for the SVNReposName is printed, but is common for all repos. How can I have the indiv

Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

2010-09-07 Thread Vadim
Hello, The situation: file is added and committed to a branch, then the same revision is merged into trunk. After that, the range of revisions are merged from trunk back to the same branch which results in a tree conflict on the added file. My understanding of svn:mergeinfo isn't consistent with t

Re: Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

2010-09-07 Thread Stefan Sperling
On Tue, Sep 07, 2010 at 12:11:51PM +0300, Vadim wrote: > Hello, > > The situation: file is added and committed to a branch, then the same > revision > is merged into trunk. After that, the range of revisions are merged from > trunk > back to the same branch which results in a tree conflict on the

Re: Repository name not listed in web

2010-09-07 Thread Nico Kadel-Garcia
On Tue, Sep 7, 2010 at 4:35 AM, Neson Maxmelbin (RBEI/EMT5) wrote: > > Hello Guys, > > I have multiple repositories configures using SVNParentPath. > > The problem I have is that in the web client, in the main page of the > repository , the name of the repository is not listed. > The value for the

RE: Repository Directory Tree

2010-09-07 Thread Allen Williams
I *think* that proj1/2/3 are separate projects inside one repository, but none of those distinctions were very clear to me (I DID read the manual, cover to cover). I certainly understand the concept of the equivalence between a directory and project (I think), but, to me, anyway, it's not clear th

RE: Repository Directory Tree

2010-09-07 Thread Giulio Troccoli
> Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- > From: Allen Williams [mailto:alad...@csunv.com] > Sent: 07 September 2010 12:24 > To: users@subversion.apache.org > Subjec

Re: Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

2010-09-07 Thread Vadim
Thanks, After you've pointed out the difficulties in recognizing if changesets are indeed equal it seems natural that SVN behaves as it does. The point regarding cyclic branches is valid. We only keep several of those as a convenience to avoid checking out new branches. I'll try to get rid of that

Re: Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

2010-09-07 Thread Stefan Sperling
On Tue, Sep 07, 2010 at 04:47:38PM +0300, Vadim wrote: > Thanks, > > After you've pointed out the difficulties in recognizing if changesets are > indeed equal > it seems natural that SVN behaves as it does. > The point regarding cyclic branches is valid. We only keep several of those > as a > conv

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Patrick Fletcher
I would really really appreciate anyone who has any information they can give me on this? I have not had any reply except for the "please don't attach images", which I replied to with full text explanation and apology for my ignorance (sry again!!)... >From Tortoise: > Subversion encountered a ser

Re: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Stefan Sperling
On Tue, Sep 07, 2010 at 11:19:21AM -0400, Patrick Fletcher wrote: > I would really really appreciate anyone who has any information they can > give me on this? I have not had any reply except for the "please don't > attach images", which I replied to with full text explanation and apology > for my

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Patrick Fletcher
Thanks for super fast reply Stefan (yes, 4 exclamations) > I've attached a helper script that you can use to run fsfsverify.py across multiple repositories. I'm running windows here and I can't get this to work in Cygwin (please excuse me if I'm just being ignorant - Unix/Python deficient) **

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Tony Sweeney
That file has DOS line endings in it. You can fix it using 'dos2unix verify-revisions.sh'. The Python file may need the same treatment. Tony. -Original Message- From: Patrick Fletcher [mailto:patrick.fletc...@marquisware.com] Sent: 07 September 2010 18:00 To: 'Stefan Sperling' Cc: user

Re: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Andy Levy
On Tue, Sep 7, 2010 at 12:59, Patrick Fletcher wrote: > Thanks for super fast reply Stefan (yes, 4 exclamations) > >> I've attached a helper script that you can use to run fsfsverify.py across > multiple repositories. > > I'm running windows here and I can't get this to work in Cygwin (please

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Patrick Fletcher
Definitely not. Cygwin was in reference to the helper script Stefan sent me (verify-revisions.sh). Am I missing something? Can that be run on a windows machine without something like cygwin? Patrick Fletcher Marquis Software Development Business Phone: (850) 877-8864 x132 Business Fax: (850) 877-0

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Patrick Fletcher
Ahh... Thanks a bunch. The Python file indeed had similar errors. Now when I run I get: patri...@desk28 /cygdrive/g/Subversion $ ./verify-revisions.sh Repositories/eomis_1_6_12 /usr/bin/seq: invalid floating point argument: 93909 Try `/usr/bin/s

Re: Repository name not listed in web

2010-09-07 Thread Ryan Schmidt
On Sep 7, 2010, at 06:27, Nico Kadel-Garcia wrote: > On Tue, Sep 7, 2010 at 4:35 AM, Neson Maxmelbin wrote: >> > >> I have multiple repositories configures using SVNParentPath. >> >> The problem I have is that in the web client, in the main page of the >> repository , the name of the repository

Re: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Stefan Sperling
On Tue, Sep 07, 2010 at 03:09:15PM -0400, Patrick Fletcher wrote: > Ahh... Thanks a bunch. The Python file indeed had similar errors. Now when I > run I get: > > > patri...@desk28 /cygdrive/g/Subversion > $ ./verify-revisions.sh Repositories/eom

RE: Subversion encountered a serious problem - during svn update

2010-09-07 Thread Patrick Fletcher
I see. I have no idea which revisions are problematic as a whole, I have only run into specific cases, of which the only way I could get around and continue working was to dump working copy and checkout HEAD again. Only reason cygwin came into picture was to run the .sh file. I have already run

Repo split across public/private networks

2010-09-07 Thread Adams, Brian M
I have a project whose subversion repository needs to be split across networks and I'm seeking ideas for how to best manage this. There are mailing list posts addressing public/private on the same server, but I didn't find much relevant to cross-network... While the core of the project can be

Re: Repo split across public/private networks

2010-09-07 Thread Tony Butt
On Wed, 2010-09-08 at 00:22 -0600, Adams, Brian M wrote: > I have a project whose subversion repository needs to be split across > networks and I'm seeking ideas for how to best manage this. There are > mailing list posts addressing public/private on the same server, but I didn't > find much re

Help with Mac repositry permissions

2010-09-07 Thread Matthew Allen
Hi I started a serverfault question about mac svn repo permissions: http://serverfault.com/questions/171647/what-are-the-correct-usergroup-for-a-mac-svn-apache-install But haven't got any response yet, anyone on here care to help? Regards -- Matthew Allen

Re: Help with Mac repositry permissions

2010-09-07 Thread Erik Andersson
Hi Not really sure about mac.. but what I would do in linux would be: sudo find /path/to/repo -type f -exec chmod 660 {} \; sudo find /path/to/repo -type d -exec chmod 2770 {} \; sudo chown -R root.www-data /path/to/repo How do you remove the global permissions? What error message do you get?