Require better support for Tags, Branches, and Merge operations in Subversion when using svn:externals

2011-03-14 Thread D, Dinoj
Hi, When using Subversion with a large project that integrates multiple independent libraries and modules that come from different SVN repositories, it is necessary to use the svn:external mechanism to link to the different modules in subversion. However there are several problems with using e

Re: Hosting multiple subdomains with a common SVNParentPath under apache

2011-03-14 Thread Daniel Shahaf
Ryan Schmidt wrote on Mon, Mar 14, 2011 at 15:34:10 -0500: > > On Mar 14, 2011, at 11:15, Daniel Shahaf wrote: > > >> You cannot use mod_rewrite or similar to fake this. Subversion clients do > >> not follow HTTP redirects. > > > > They will in 1.7: > > http://subversion.apache.org/docs/releas

Re: pre-lock.bat Failed in Repo browser

2011-03-14 Thread Daniel Becroft
On Tue, Mar 15, 2011 at 8:25 AM, Michael Diers wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 2011-03-10 11:21, Michael Diers wrote: > > On 2011-03-10 08:23, Waseem Bokhari wrote: > >> This script works fine in all scenarios except Anyone can Steal Lock > when Unlock. > > > >>> U

Re: pre-lock.bat Failed in Repo browser

2011-03-14 Thread Michael Diers
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-03-10 11:21, Michael Diers wrote: > On 2011-03-10 08:23, Waseem Bokhari wrote: >> This script works fine in all scenarios except Anyone can Steal Lock when >> Unlock. > >>> Unable to Break lock through check for modifications Option >>> Unabl

Re: subclipse != cvs eclipse, or how to "reject a change" ? svn API guilty?

2011-03-14 Thread Mark Phippard
On Mon, Mar 14, 2011 at 4:38 PM, Ryan Schmidt wrote: > > On Mar 14, 2011, at 13:57, rupert.thurner wrote: > >> the eclipse cvs client allows to reject a change by simply clicking >> "mark the local file as merged", and commit it. >> >> There are multiple enhancement requests filed against sublicps

Re: Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 06:33:13PM +0100, Christoph Bartoschek wrote: > The keyword is set and I do not want to change it because I just want to > import the changes from repository A to repository B. The guys that set the > keyword definitively want to see it. > > I want to disable the expansi

Re: subclipse != cvs eclipse, or how to "reject a change" ? svn API guilty?

2011-03-14 Thread rupert.thurner
On Mar 14, 9:38 pm, Ryan Schmidt wrote: > On Mar 14, 2011, at 13:57, rupert.thurner wrote: > > > the eclipse cvs client allows to reject a change by simply clicking > > "mark the local file as merged", and commit it. > > > There are multiple enhancement requests filed against sublicpse which > > g

Re: subclipse != cvs eclipse, or how to "reject a change" ? svn API guilty?

2011-03-14 Thread Ryan Schmidt
On Mar 14, 2011, at 13:57, rupert.thurner wrote: > the eclipse cvs client allows to reject a change by simply clicking > "mark the local file as merged", and commit it. > > There are multiple enhancement requests filed against sublicpse which > get rejected because "svn does not offer such a fea

Re: Hosting multiple subdomains with a common SVNParentPath under apache

2011-03-14 Thread Ryan Schmidt
On Mar 14, 2011, at 11:15, Daniel Shahaf wrote: >> You cannot use mod_rewrite or similar to fake this. Subversion clients do >> not follow HTTP redirects. > > They will in 1.7: > http://subversion.apache.org/docs/release-notes/1.7#http-redirects Neat! I see Subversion will in 1.7 follow perma

RE: Assistance with SVN layout from CVS

2011-03-14 Thread Bob Archer
> Hi, I have been using CVS since 1998 and I am now finally moving to > SVN. After having studied SVN for the last few weeks, getting the > server prepared and working with clients, both console and GUI, I > think I can use the accumulated experience for a simple migration > and > new SVN layout. >

RE: Out of memory issue with svn merging

2011-03-14 Thread Chris Evans
Without a 32bit executable being large address aware it's not going to be able to use more than around 2GB of virtual address space. Ideally you'd use a 64bit client on a 64bit OS. If that's not possible then you can maybe squeeze a bit more out of a 32bit client by forcing it to use up to 3GB.

subclipse != cvs eclipse, or how to "reject a change" ? svn API guilty?

2011-03-14 Thread rupert.thurner
the eclipse cvs client allows to reject a change by simply clicking "mark the local file as merged", and commit it. There are multiple enhancement requests filed against sublicpse which get rejected because "svn does not offer such a feature via API" and "we (subclipse) do not tinker with your fil

Out of memory issue with svn merging

2011-03-14 Thread richard.everett
Hi, We are seeing the following error when trying to perform a command-line svn merge with Subversion 1.6.9 under 32 bit Windows XP. Out of memory - terminating application. This application has requested the Runtime to terminate it in an unusual way. Please contact the applicat

Re: Failed SVN Verify Logs

2011-03-14 Thread Jules Herr
Yes we're using the binaries for Collabnet, not exactly sure which version it is - is there an easy way to determine? Not sure if I can access revision 607, is there a way to determine what files are in a particular revision? It appears I can run verification on all revisions 1-606 and I'm runni

Re: Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Christoph Bartoschek
Am Montag, 14. März 2011 schrieb Stefan Sperling: > On Mon, Mar 14, 2011 at 05:11:03PM +0100, Christoph Bartoschek wrote: > > Hi, > > > > I would like to merge the changes of a directory in repository A to a > > directory in repository B. My problem is that several merges fail because > > of the i

Re: Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Christoph Bartoschek
Am Montag, 14. März 2011 schrieb Nico Kadel-Garcia: > On Mon, Mar 14, 2011 at 12:11 PM, Christoph Bartoschek > > wrote: > > Hi, > > > > I would like to merge the changes of a directory in repository A to a > > directory in repository B. My problem is that several merges fail because > > of the i

Re: Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 05:11:03PM +0100, Christoph Bartoschek wrote: > Hi, > > I would like to merge the changes of a directory in repository A to a > directory in repository B. My problem is that several merges fail because of > the id keywords. > > Svn diff for example shows: > > -/* > -**

Re: Merging from foreign repositories

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 05:53:04PM +0100, Christoph Bartoschek wrote: > Am Montag, 14. März 2011 schrieb Stefan Sperling: > > You can probably write your hook script to be smart enough to do it. > > But I suppose in your situation the dump/load approach is easier than > > trying to play tricks with

Re: Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Nico Kadel-Garcia
On Mon, Mar 14, 2011 at 12:11 PM, Christoph Bartoschek wrote: > Hi, > > I would like to merge the changes of a directory in repository A to a > directory in repository B. My problem is that several merges fail because of > the id keywords. > > Svn diff for example shows: > > -/* > -** $Id: st_opt_

Re: Merging from foreign repositories

2011-03-14 Thread Christoph Bartoschek
Am Montag, 14. März 2011 schrieb Stefan Sperling: > On Mon, Mar 14, 2011 at 05:05:14PM +0100, Christoph Bartoschek wrote: > > thanks for your suggestion. But the commit that created dirA also created > > lots of other directories. I am only interessted in dirA. > > Then let's just agree that the o

Re: external diff and diff3 tools

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 06:08:11PM +0200, Daniel Shahaf wrote: > I suppose you could write a wrapper diff3 tool that invokes either > /usr/bin/diff3 or your diff3 tool depending on the files it's invoked > for? > > Not saying it's ideal, but it'll work today (not when 1.7 is released). Ways of in

Re: Merging from foreign repositories

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 05:05:14PM +0100, Christoph Bartoschek wrote: > thanks for your suggestion. But the commit that created dirA also created > lots > of other directories. I am only interessted in dirA. Then let's just agree that the other stuff added in that commit is a merge conflict. So

Re: Hosting multiple subdomains with a common SVNParentPath under apache

2011-03-14 Thread Daniel Shahaf
Ryan Schmidt wrote on Thu, Mar 10, 2011 at 20:09:31 -0600: > On Mar 10, 2011, at 15:17, Daniel F. Garcia wrote: > > > This is a good solution, but I have 2 additional requirements > > * I have >100 subdomains and I want to save time setting them up (ok, I > > could script this) > > * I need to be

Merging from a foreign repository and svn:id keyword

2011-03-14 Thread Christoph Bartoschek
Hi, I would like to merge the changes of a directory in repository A to a directory in repository B. My problem is that several merges fail because of the id keywords. Svn diff for example shows: -/* -** $Id: st_opt_small.c,v 1.3 2004/03/08 17:25:57 mueller Exp $ -** -** $Locker: $ -*/ +/* $I

Re: 'Could not get next bucket brigade' error

2011-03-14 Thread Kris Deugau
Boyandin Konstantin wrote: 06.03.11, 20:00, "Nico Kadel-Garcia": But there is also the RPMforge release of subversion-1.6.15 at http://rpmrepo.org/RPMforge/. Enjoy, I put up that one (based on variious previous releases.) I'd urge you to upgrade, ASAP, for a lot of *other* reasons. Tha

Re: external diff and diff3 tools

2011-03-14 Thread Daniel Shahaf
I suppose you could write a wrapper diff3 tool that invokes either /usr/bin/diff3 or your diff3 tool depending on the files it's invoked for? Not saying it's ideal, but it'll work today (not when 1.7 is released). Sébastien Paumier wrote on Mon, Mar 14, 2011 at 12:59:23 +0100: > Hello, > I have t

Re: Merging from foreign repositories

2011-03-14 Thread Daniel Shahaf
Christoph Bartoschek wrote on Mon, Mar 14, 2011 at 16:08:57 +0100: > Hi, > > I would like to merge all changes in a directory from repository A to a > directory in repository B. > > My idea was to do a loop over all iterations and merge them to dirB: > > svn merge -c rev file:///path/to/rep/A/d

Re: Merging from foreign repositories

2011-03-14 Thread Christoph Bartoschek
Am Montag, 14. März 2011 schrieb Stefan Sperling: > On Mon, Mar 14, 2011 at 04:08:57PM +0100, Christoph Bartoschek wrote: > > Hi, > > > > I would like to merge all changes in a directory from repository A to a > > directory in repository B. > > > > My idea was to do a loop over all iterations and

Re: Merging from foreign repositories

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 04:08:57PM +0100, Christoph Bartoschek wrote: > Hi, > > I would like to merge all changes in a directory from repository A to a > directory in repository B. > > My idea was to do a loop over all iterations and merge them to dirB: > > svn merge -c rev file:///path/to/rep/

Merging from foreign repositories

2011-03-14 Thread Christoph Bartoschek
Hi, I would like to merge all changes in a directory from repository A to a directory in repository B. My idea was to do a loop over all iterations and merge them to dirB: svn merge -c rev file:///path/to/rep/A/dirA dirB My problem is that for the revision where dirA is created in repositoryA

Failed SVN Verify Logs

2011-03-14 Thread Jules Herr
Hi, I had a failed SVN VERIFY and am submitting the log files as directed by the application. Any and all help is greatly appreciated! Thanks Jules Here is the screen shot and log files of the svnadmin verify which I did in Windows against the kxsrc Subversion repository -- Jules Her

external diff and diff3 tools

2011-03-14 Thread Sébastien Paumier
Hello, I have to deal with a special file format representing a graph. To do that, I have to write my own diff and diff3, but I did not figure out how to invoke my own programs only for my special file type, since those files are mixed with other file types on the svn server. Is there a way to

Re: 'Could not get next bucket brigade' error

2011-03-14 Thread Boyandin Konstantin
06.03.11, 20:00, "Nico Kadel-Garcia" : > On Sun, Mar 6, 2011 at 7:22 AM, Andy Levy wrote: > > On Sat, Mar 5, 2011 at 22:34, Konstantin Boyandin > wrote: > >> Hello, > >> > >> Setup: there's a server where Subversion repository is located (working > >> via Apache backend), OS CentOS 5.5, Su