Re: Reintegrate with vendor branches

Ulrich Eckhardt wrote: Check if while merging you omitted changing the mergeinfo in the 'libA' folder. If so, that's probably a human error. Adding the missing info manually is the right way to go. Actually, the fact that merging to X changes the mergeinfo in subdir Y that wasn't touched is a

Re: merging trunk to branch merges the whole trunk history

On Wednesday 03 February 2010, esatel wrote: If I do the following: 1. Create a branch around trunk revision 1598 What is a branch around trunk? Or, do you mean a branch around the time that trunk had revision 1598? If so, you have a conceptual error here, as it is not trunk that has that

Error writing base64 data: APR does not understand this error code

Hi, We upgraded to subversion 1.6.6 and Apache 2.2.14 on windows 2k3 server and started getting the below mentioned errors *Error writing base64 data: APR does not understand this error code* *Provider encountered an error while streaming a REPORT response. 500, #0* This error occurs while

Re: merging trunk to branch merges the whole trunk history

On Tue, Feb 02, 2010 at 07:30:27PM -0800, esatel wrote: Hi, I have an svn repository created by converting an old cvs repository using SVN 1.5.1. If I do the following: 1. Create a branch around trunk revision 1598 2. Work a bit further on the trunk and commit (I don't think this is

Re: Deleted directory committed to repo translated to ignored directory locally

On 02/02/2010 23:34, Dave Purrington wrote: Marge doesn't have a matching pattern in her global ignores Hope you are aware that on Windows there are multiple sources for global ignores including the registry - I don't know the details but there was a thread about it recently. -- Stein

Re: svn:ignore an existing file

1) I've a file that MUST exist in the repository in its default version Then forget svn:ignore - it doesn't apply to versioned files. You could lock the file in each branch where it occurs, or set the svn:lock property, to make it more difficult for others to tamper with it. But in my

RE: svn:ignore an existing file

Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: GF [mailto:gan...@gmail.com] Sent: 03 February 2010 09:29 To:

Re: svn:ignore an existing file

On Wed, Feb 3, 2010 at 5:28 PM, GF gan...@gmail.com wrote: Hello everyone. I've two question about svn:ignore 1) I've a file that MUST exist in the repository in its default version, but i don't want that people to commit any local change to it. Is there a way to have this behaviour with

Re: Deleted directory committed to repo translated to ignored directory locally

Clever clever. I'm still trying to wrap my head around that idea. I'll look again at the patterns. The fact that no one has heard of this problem makes me think I've missed a source of ignore patterns somewhere. Time to quadruple check. I also see from another reply that the registry is a source

Getting depressed. (newbie question, probably...)

Hi Subversion Users ! I would be glad, if someone could give me some advice. I have 2 boxes 1st MacOS X - client and 2nd FreeBSD 8 -server. The second (FreeBSD) box is dev server for some web projects. I have svnserve running on BSD box, but it seems to accept only IP6 localhost (i think)

RE: svn:ignore an existing file

On Wed, Feb 3, 2010 at 5:28 PM, GF gan...@gmail.com wrote: Hello everyone. I've two question about svn:ignore 1) I've a file that MUST exist in the repository in its default version, but i don't want that people to commit any local change to it. Is there a way to have this behaviour with

Preventing replace operations

We are using subversion. The users have been using Windows explorer to drag and drop directories rather than merging. This causes many problems for users down the line. Is there a setting that can be added to the httpd.conf file to prevent this?

RE: ignore an existing file

Hi 1) use pre-commit hook 2) no Thanks Lakshman -Original Message- From: GF [mailto:gan...@gmail.com] Sent: Wednesday, 3 February 2010 8:29 PM To: users@subversion.apache.org Subject: svn:ignore an existing file Hello everyone. I've two question about svn:ignore 1) I've a file that

Valid Syntax for commit-access-control.cfg

Hi, I'm trying to find some documentation describing valid syntax for the commit-access-control.cfg file. I've been bitten in the past by using something like: [SVN - config modification permissions] match = ^SVN access = read-write users = first.lastname Having a '.' in the username

SVN + Apache : Memory Consumption

Hey everyone, I am new to this list but I stumbled across an issue on a newly installed server that I can't figure out by myself. Short factsheet: OS CentOS 5.4 fully updated Apache 2.2.3 SVN 1.6.9 (Binary package from your site) Neon0.28.4 (Binary package from your site) The