Re: race condition on checkin immediately followed by a merge?

2010-05-19 Thread Daniel Widenfalk
Hi Dan, Dan Stromberg wrote: > On Tue, May 18, 2010 at 1:20 AM, Bert Huijben wrote: > >>> Subversion uses a simple heuristic to determine if a file has >>> changed. It is well documented in the source code but perhaps >>> not so well known: >>> >>> If the size and time stamp of a file is the sam

RE: SVN Error

2010-05-19 Thread Wadhavankar, Hemant
Thanks Tom. I am using http and not https. I noticed "Timeout 300" in conf/extra/httpd-default.conf - but it is not getting called (include) in httpd.conf. So I will play around with it. Best, Hemant Unstoppable.. From: Thomas Loy [mailto:thomas@cbeyond.net] Sent: Wednesday, May 19, 201

Re: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Ryan Schmidt
On May 19, 2010, at 15:10, Brown, Beverly wrote: > One question - could this have anything to do with filenames that have > spaces in them? I'm searching my tree now trying to find an inaccessible > path using > > find . -type f |xargs sum > /dev/null > > It's showing a filename in a .sv

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Daniel Becroft
On Thu, May 20, 2010 at 10:40 AM, Bostjan Skufca wrote: > I should have known that the first thing to surface would be "why" and not > "the answer". But your question, Daniel, was polite at least :) > > If you pay attention to the command line in editor-cmd setting you can > notice that content is

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Bostjan Skufca
I should have known that the first thing to surface would be "why" and not "the answer". But your question, Daniel, was polite at least :) If you pay attention to the command line in editor-cmd setting you can notice that content is appended. Therefore it is positioned below the -- This line and e

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Daniel Becroft
On Thu, May 20, 2010 at 10:08 AM, Bostjan Skufca wrote: > Hi all! > > I would like to change default contents of commit message from 'svn status' > output to add 'svn diff' output. How can this be achieved? > > I have already tried setting editor-cmd in ~/.subversion/config to "svn diff >>> svn-co

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Andy Levy
On Wed, May 19, 2010 at 20:08, Bostjan Skufca wrote: > Hi all! > > I would like to change default contents of commit message from 'svn status' > output to add 'svn diff' output. How can this be achieved? > > I have already tried setting editor-cmd in ~/.subversion/config to "svn diff >>> svn-commi

How to change default svn-commit.tmp contents

2010-05-19 Thread Bostjan Skufca
Hi all! I would like to change default contents of commit message from 'svn status' output to add 'svn diff' output. How can this be achieved? I have already tried setting editor-cmd in ~/.subversion/config to "svn diff >> svn-commit.tmp && mcedit" and it partially works, but creates diff against

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
I tried with a fresh working copy and got the same results. Beverly -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Wednesday, May 19, 2010 4:21 PM To: Brown, Beverly; users@subversion.apache.org Subject: RE: "Unreadable path encountered" running svn merge --reinte

Trying to revive a repo

2010-05-19 Thread Kevin Korb
We were backing up the repository files, but not a dump. We lost the server and we're trying to restore the repo. When we run a svnadmin verify, we get this back... * Verified revision 0. svnadmin: Revision file lacks trailing newline The files are all there, and they seem fine... How do we go

Re: svn diff issue: svn confuses files with dirs on hfsplus?

2010-05-19 Thread Georg Kunz
Hi Andy thanks for the reply. See below. On 05/19/2010 10:14 PM, Andy Levy wrote: On Wed, May 19, 2010 at 15:40, Georg Kunz wrote: Hi! I encoutered a weird problem with subversion 1.6.6& 1.6.9 on a 32& 64bit Xubuntu 10.04: My working copies are located on a hfsplus partition which is share

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
> Yes, I can do everything else with no problem and will revert back to > that to get the job done. I'd really like to be able to use the merge > tracking, though. > > One question - could this have anything to do with filenames that have > spaces in them? I'm searching my tree now trying to find

Re: svn diff issue: svn confuses files with dirs on hfsplus?

2010-05-19 Thread Andy Levy
On Wed, May 19, 2010 at 15:40, Georg Kunz wrote: > Hi! > > I encoutered a weird problem with subversion 1.6.6 & 1.6.9 on a 32 & 64bit > Xubuntu 10.04: My working copies are located on a hfsplus partition which is > shared across the Xubuntu Linux and MacOS on my development machine. For > some str

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
Yes, I can do everything else with no problem and will revert back to that to get the job done. I'd really like to be able to use the merge tracking, though. One question - could this have anything to do with filenames that have spaces in them? I'm searching my tree now trying to find an inaccessi

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
Well... I'm stumped. Can you just do a standard merge like we did before merge tracking. Might be the only way to get it done without going crazy? > -Original Message- > From: Brown, Beverly [mailto:beverly.br...@stratus.com] > Sent: Wednesday, May 19, 2010 4:01 PM > To: Bob Archer; users

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
No, I just double-checked. There are two paths in svn:mergeinfo and both still exist. The only svn:mergeinfo properties are at the root of the working copy (I did svn pg svn:mergeinfo -R of both the trunk and the branch just to be sure). Beverly -Original Message- From: Bob Archer [mailto

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
Yes, it was a typo in my email. I used two dashes. Beverly -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Wednesday, May 19, 2010 4:00 PM To: Brown, Beverly; users@subversion.apache.org Subject: RE: "Unreadable path encountered" running svn merge --reintegrate Yo

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
It would be incredibly helpful if svn printed out the path it didn't like. Beverly -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Wednesday, May 19, 2010 3:45 PM To: Brown, Beverly; users@subversion.apache.org Subject: RE: "Unreadable path encountered" running svn

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
You need two dashes... not one. Probably a typo on your email but just wanted to check. > -Original Message- > From: Brown, Beverly [mailto:beverly.br...@stratus.com] > Sent: Wednesday, May 19, 2010 3:52 PM > To: Bob Archer; users@subversion.apache.org > Subject: RE: "Unreadable path

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
Yes, why? Is that improper syntax? I tried without the "." at the end first and then put it in there in case it was confused about the desitnation. Beverly -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Wednesday, May 19, 2010 3:47 PM To: Brown, Beverly; users@s

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
> --reintegrate > > > I am trying to use the svn merge tracking in the SVN 1.6.11 client > (server > > is running 1.6.4). > > > > I am getting this error when I try to reintegrate back into my trunk: > > svn: Unreadable path encountered; access denied > > > > You're not using a sparse checkout of

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
No, we never do sparse checkouts. It's the whole tree or nothing. I don't think there would be any paths in the tree I don't have access to. I did the checkout, so everything in there should be accessible by me. All other commands work. The only one giving me this error is "svn merge --reintegrate

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
> I am trying to use the svn merge tracking in the SVN 1.6.11 client (server > is running 1.6.4). > > I am getting this error when I try to reintegrate back into my trunk: > svn: Unreadable path encountered; access denied > > I can do any other type of merge with no problem, just the -reintegrate

RE: "Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Bob Archer
> I am trying to use the svn merge tracking in the SVN 1.6.11 client (server > is running 1.6.4). > > I am getting this error when I try to reintegrate back into my trunk: > svn: Unreadable path encountered; access denied > You're not using a sparse checkout of your trunk are you? Are there pat

svn diff issue: svn confuses files with dirs on hfsplus?

2010-05-19 Thread Georg Kunz
Hi! I encoutered a weird problem with subversion 1.6.6 & 1.6.9 on a 32 & 64bit Xubuntu 10.04: My working copies are located on a hfsplus partition which is shared across the Xubuntu Linux and MacOS on my development machine. For some strange reason, I cannot diff single files in any working c

"Unreadable path encountered" running svn merge --reintegrate

2010-05-19 Thread Brown, Beverly
I am trying to use the svn merge tracking in the SVN 1.6.11 client (server is running 1.6.4). I am getting this error when I try to reintegrate back into my trunk: svn: Unreadable path encountered; access denied I can do any other type of merge with no problem, just the -reintegrate is giv

Re: Subversion repo upgrade makes repository unusable.

2010-05-19 Thread vishwajeet singh
On Thu, May 20, 2010 at 12:55 AM, Michael Cole wrote: > Hi, I recently upgraded my subversion server from 1.4.6 to 1.6.11. The > repos all seem to work correctly after this. I then try to upgrade a repo by > issuing the svnadmin update command, and it produces no errors and says the > update is

Subversion repo upgrade makes repository unusable.

2010-05-19 Thread Michael Cole
Hi, I recently upgraded my subversion server from 1.4.6 to 1.6.11. The repos all seem to work correctly after this. I then try to upgrade a repo by issuing the svnadmin update command, and it produces no errors and says the update is complete. However, I am unable to open the repository after this.

RE: Managing Product templates

2010-05-19 Thread Bob Archer
> We are currently branching into Subversion usage operating with VisualSVN > Server (will upgrade to Enterprise when trials are complete) and a client > side using TortoiseSVN. In general all very happy and things are all > pretty seamless and obvious, but... > > I would like to introduce the con

Re: Managing Product templates

2010-05-19 Thread Les Mikesell
On 5/19/2010 11:34 AM, Hutchinson, Steve (UK) wrote: Hi, We are currently branching into Subversion usage operating with VisualSVN Server (will upgrade to Enterprise when trials are complete) and a client side using TortoiseSVN. In general all very happy and things are all pretty seamless and obv

RE: Problem committing files starting with "."

2010-05-19 Thread Brooks, Rob (Rob)
Ryan, Thanks for the message. We got it resolved and your message jogged my memory a bit on what it could be. It was a Siteminder (single sign on) web agent that was blocking files starting with ".". We changed that config and the issue was resolved. Rob -Original Message- From: Ryan

Re: Pre-commit hook problem

2010-05-19 Thread Andy Levy
On Wed, May 19, 2010 at 12:57, Stefan Sperling wrote: > On Wed, May 19, 2010 at 11:48:21AM -0500, BRAMAN, JULIA M  (JSC-ER711) wrote: >> The extension has been changed from .tmpl to .sh > > Drop the .sh extension and it should work. > The hook needs to be called "pre-commit". Except on Windows (o

Re: Pre-commit hook problem

2010-05-19 Thread Stefan Sperling
On Wed, May 19, 2010 at 11:48:21AM -0500, BRAMAN, JULIA M (JSC-ER711) wrote: > The extension has been changed from .tmpl to .sh Drop the .sh extension and it should work. The hook needs to be called "pre-commit". Stefan

Pre-commit hook problem

2010-05-19 Thread BRAMAN, JULIA M (JSC-ER711)
Hi, I have a svn 1.6.5 repository that I'm trying to implement a pre-commit hook on (below). I've started with the template, and changed it only slightly. #!/bin/sh REPOS="$1" TXN="$2" # Make sure that the log message contains some text. SVNLOOK=/opt/CollabNet_Subversion/bin/svnlook GREP=/bin/

Managing Product templates

2010-05-19 Thread Hutchinson, Steve (UK)
Hi, We are currently branching into Subversion usage operating with VisualSVN Server (will upgrade to Enterprise when trials are complete) and a client side using TortoiseSVN. In general all very happy and things are all pretty seamless and obvious, but... I would like to introduce the concept

Re: race condition on checkin immediately followed by a merge?

2010-05-19 Thread Dan Stromberg
On Tue, May 18, 2010 at 1:20 AM, Bert Huijben wrote: >> Subversion uses a simple heuristic to determine if a file has >> changed. It is well documented in the source code but perhaps >> not so well known: >> >> If the size and time stamp of a file is the same as when checking >> out the file it i

RE: SVN Error

2010-05-19 Thread Thomas Loy
That would be the first thing I would do. What is the current timeout? Are you trying to use http or https? Regards, Tom From: Wadhavankar, Hemant [mailto:hemant.wadhavan...@lsi.com] Sent: Wednesday, May 19, 2010 10:58 AM To: users@subversion.apache.org Subject: SVN Error Hello, I am getting

SVN Error

2010-05-19 Thread Wadhavankar, Hemant
Hello, I am getting an error like this. I am using SVN 1.6.11 and Apache 2.2.14 svn: REPORT of '/!svn/vcc/default': Could not read response body: connection was closed by server I tried SVN checkout using file:/// method and it did not have any issues. Will changing "Timeout" in Apache configu

[Press Release] WANdisco Gives Back to the Subversion Community

2010-05-19 Thread george.pow...@wandisco.com
Profits from WANdisco Subversion Support Contract Sales Go Toward Subversion’s Continuing Development and Support the Activities of the Subversion community. http://svn.wandisco.com/WANdisco_Gives_Back_to_the_Subversion_Community

RE: svn:mergeinfo resurrecting from the dead

2010-05-19 Thread Bob Archer
> Hi there, > > Are you using externals? > > Yes, we use externals both for importing code from other repos and also as > symbolic links within our repo, since our build system runs on Windows > which has no support for native symbolic links. > > Thanks! Ah... iirc this is a bug that happens whe

SVN-Notify and such

2010-05-19 Thread Mathieu Malaterre
Hi there, I am looking for a way to send email after each commit for my SVN server. There used to be page describing all options at: http://subversion.tigris.org/links.html#misc-utils I cannot find where this page moved. Basically I am looking for a light solution (do not send the output