Re: Correct way of doing merge in a complex repository?

2014-06-25 Thread Stefan Sperling
On Wed, Jun 25, 2014 at 02:26:34PM -0700, Xin LI wrote: > Thanks for that. Is it possible to tell svn that the file have two > parents? e.g. it's derived from both contrib/file/ascmagic.c and > ^/vendor/file/dist/src/ascmagic.c? Or is that impossible with svn? Currently, SVN doesn't have such a

Re: Correct way of doing merge in a complex repository?

2014-06-25 Thread Xin LI
Hi, Stefan, On Wed, Jun 25, 2014 at 11:46 AM, Stefan Sperling wrote: > On Wed, Jun 25, 2014 at 10:47:47AM -0700, Xin LI wrote: > > Hi, > > > > In the FreeBSD project, we use "vendor branch" and merge changes that > > happen there to trunk. The FreeBSD project's repository can be accessed > at >

Re: Correct way of doing merge in a complex repository?

2014-06-25 Thread Stefan Sperling
On Wed, Jun 25, 2014 at 10:47:47AM -0700, Xin LI wrote: > Hi, > > In the FreeBSD project, we use "vendor branch" and merge changes that > happen there to trunk. The FreeBSD project's repository can be accessed at > svn://svn.freebsd.org/base or via web at http://svnweb.freebsd.org/base . > > Now

Correct way of doing merge in a complex repository?

2014-06-25 Thread Xin LI
Hi, In the FreeBSD project, we use "vendor branch" and merge changes that happen there to trunk. The FreeBSD project's repository can be accessed at svn://svn.freebsd.org/base or via web at http://svnweb.freebsd.org/base . Now I'm facing a problem with the merging approach and would like to know

Re: Where to get apache httpd Windoze binaries compatible with alagazam?

2014-06-25 Thread Ben Reser
On 6/25/14 3:49 AM, Cooke, Mark wrote: > I have investigated WanDisco (no bindings) and CollabNet (won't even install > without Java, not allowed). Note I need offline installers, so that excludes > (I believe) tools such as userSVN... The WANdisco Windows installer has swig-python and JavaHL b

RE: Error 70014 can't synchronize with repository, can't read file, End of File

2014-06-25 Thread Tim Pospeshil
Problem solved. I tried svnadmin recover but it returned the End of File error. Next I looked into Andreas’ solution. The current file had “NULNULNULNUL” so I changed it to the last revision from the revs folder, and added the necessary filler text, so it read “2098 z z” (I found out yo

RE: Where to get apache httpd Windoze binaries compatible with alagazam?

2014-06-25 Thread Cooke, Mark
> -Original Message- > From: Andreas Stieger [mailto:andreas.stie...@gmx.de] > Sent: 25 June 2014 13:30 > > Hi, > > > On 25 Jun 2014, at 11:49, "Cooke, Mark" wrote: > > > > windows binaries for both httpd and subversion that (a) play nicely > > together and (b) include the subversion pyt

Re: Where to get apache httpd Windoze binaries compatible with alagazam?

2014-06-25 Thread Andreas Stieger
Hi, > On 25 Jun 2014, at 11:49, "Cooke, Mark" wrote: > > windows binaries for both httpd and subversion that (a) play nicely together > and (b) include the subversion python bindings that I need for our Trac > (trac.edgewall.org) web sites (also hosted by apache httpd using mod_wsgi). [...] >

Where to get apache httpd Windoze binaries compatible with alagazam?

2014-06-25 Thread Cooke, Mark
Folks, I have been told I must update our subversion server because of the recent security issues with OpenSSL. I am struggling to find windows binaries for both httpd and subversion that (a) play nicely together and (b) include the subversion python bindings that I need for our Trac (trac.edg

subscribe

2014-06-25 Thread Xin LI