Compilation of Subversion on Windows Server 2008 is failing
Hi Team, We are trying to install subversion 1.9.3 on Windows 2008 Server with Apache Haus 2.4 which already has APR and OpenSSL compiled into it. We however have ignored the optional packages and sticking to core packages only. We have Visual Studio 2015 Community Edition installed on our machine. However, after running 'python gen-make.py --vsnet-vesion=2015' we still are not getting the subversion_vcnet.sln created. Output of the gen-make.py reports this warning message: "WARNING: errno intersects APR error codes: ..." There are few numeric codes that are reported with the above warning. Any help would be appreciated. Also, please let us know if you need more information. Regards,Subha
Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11
On Mon, Mar 14, 2016 at 11:43 AM, Eric Dramstad wrote: > Is there a right way to install subversion 1.9.3 using GNU Stow? > > I use stow to manage package installation for packages that I build > myself. I'm trying to build and install subversion 1.9.3 on a machine > running Red Hat Enterprise Linux (RHEL) 5.11. I'm building subversion > myself because the newest version available from yum is 1.6.11. Don't hurt yourself trying to do that. The build dependencies have gotten too far ahead of the base components for RHEL 5 for even me, and I published the last update for Repoforge. Save yourself some pain and take a look at Wandisco's public offerings if you need to run the server on RHEL 5, or stell yourself for the jump tp RHEL 6 or RHEL 7. > The last time I built subversion from source, it was subversion 1.6.11 > on a different machine running RHEL 7.2. I upgraded to subversion > 1.9.3 on that machine and managed to get past similar libtool errors > by configuring with --disable-shared --enable-all-static in addition > to the flags mentioned above. That approach did not work on the RHEL > 5.11 machine. If you're gong to go this route, take a look at my old tools at https://github.com/nkadel/subversion-1.9.x-srpm. That won't get it working with all the missing dependencies for RHEL or CentOS 5, but can give some traction for setting up actual RPM's for RHEL 6 or 7. > I found a few threads that mentioned stow, mentioned a similar libtool > error message, or suggested a way to get around a similar libtool > error but none seemed to be about using stow to install subversion > *and* having the above error. Here are a few threads I came across: > > - http://svn.haxx.se/dev/archive-2003-04/0304.shtml > - http://svn.haxx.se/users/archive-2004-03/0599.shtml > - http://svn.haxx.se/dev/archive-2003-03/1839.shtml > > Thank you in advance for you help, > Eric Dramstad >
Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11
On Mon, Mar 14, 2016 at 8:08 PM, Daniel Shahaf wrote: > Try --disable-shared --enable-static without --enable-all-static. > Your suggestion to use --disable-shared --enable-static worked. Thanks for that! I mentioned that a previous attempt to configure with --disable-shared --enable-all-static didn't work. That build failed with a long list of undefined references to OpenSSL symbols. I realized that I have both the 32- and 64-bit versions of OpenSSL installed. When I changed the serf build to point to the location of 64-bit OpenSSL, the statically-linked build worked. In case someone (or more likely me) needs to do something similar in the future, here's the entire build procedure that worked: apr 1.3.8: tar xvf subversion-deps-1.6.11.tar.bz2 pushd subversion-1.6.11/apr ./configure --enable-layout=GNU make mkdir -p /usr/local/packages/apr-1.3.8 make install prefix=/usr/local/packages/apr-1.3.8 stow -t /usr/local -d /usr/local/packages apr-1.3.8 popd apr-util 1.3.9: pushd subversion-1.6.11/apr-util ./configure --with-apr=/usr/local --enable-layout=GNU make mkdir -p /usr/local/packages/apr-util-1.3.9 make install prefix=/usr/local/packages/apr-util-1.3.9 stow -t /usr/local -d /usr/local/packages apr-util-1.3.9 popd serf 1.3.8: tar xvf serf-1.3.8.tar.bz2 pushd serf-1.3.8 scons APR=/usr/local APU=/usr/local OPENSSL=/lib64 PREFIX=/usr/local mkdir -p /usr/local/packages/serf-1.3.8 scons install PREFIX=/usr/local/packages/serf-1.3.8 stow -t /usr/local -d /usr/local/packages serf-1.3.8 popd subversion 1.9.3: tar xvf subversion-1.9.3.tar.bz2 unzip sqlite-amalgamation-3071501.zip mv sqlite-amalgamation-3071501 subversion-1.9.3/sqlite-amalgamation pushd subversion-1.9.3 ./configure --with-apr=/usr/local\ --with-apr-util=/usr/local\ --with-serf=/usr/local\ --prefix=/usr/local\ --disable-shared\ --enable-static make mkdir -p /usr/local/packages/subversion-1.9.3 make install prefix=/usr/local/packages/subversion-1.9.3 stow -t /usr/local -d /usr/local/packages subversion-1.9.3 popd Thanks again, Eric
Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11
On Tue, Mar 15, 2016 at 8:38 AM, Nico Kadel-Garcia wrote: > Don't hurt yourself trying to do that. The build dependencies have > gotten too far ahead of the base components for RHEL 5 for even me, > and I published the last update for Repoforge. Save yourself some pain > and take a look at Wandisco's public offerings if you need to run the > server on RHEL 5, or stell yourself for the jump tp RHEL 6 or RHEL 7. I managed to get the build working without *too much* pain. Unfortunately, I'm stuck using RHEL 5.11 on this one machine for the forseeable future. Our other machines are running 7.2 and seem to work better. Thanks for the tip about Wandisco's offerings. I didn't think to look around for builds of old subversion. I'll keep your tools in mind if I need to build subversion again in the future. Thanks again, Eric Dramstad On Tue, Mar 15, 2016 at 8:38 AM, Nico Kadel-Garcia wrote: > On Mon, Mar 14, 2016 at 11:43 AM, Eric Dramstad wrote: > > Is there a right way to install subversion 1.9.3 using GNU Stow? > > > > I use stow to manage package installation for packages that I build > > myself. I'm trying to build and install subversion 1.9.3 on a machine > > running Red Hat Enterprise Linux (RHEL) 5.11. I'm building subversion > > myself because the newest version available from yum is 1.6.11. > > Don't hurt yourself trying to do that. The build dependencies have > gotten too far ahead of the base components for RHEL 5 for even me, > and I published the last update for Repoforge. Save yourself some pain > and take a look at Wandisco's public offerings if you need to run the > server on RHEL 5, or stell yourself for the jump tp RHEL 6 or RHEL 7. > > > The last time I built subversion from source, it was subversion 1.6.11 > > on a different machine running RHEL 7.2. I upgraded to subversion > > 1.9.3 on that machine and managed to get past similar libtool errors > > by configuring with --disable-shared --enable-all-static in addition > > to the flags mentioned above. That approach did not work on the RHEL > > 5.11 machine. > > If you're gong to go this route, take a look at my old tools at > https://github.com/nkadel/subversion-1.9.x-srpm. That won't get it > working with all the missing dependencies for RHEL or CentOS 5, but > can give some traction for setting up actual RPM's for RHEL 6 or 7. > > > I found a few threads that mentioned stow, mentioned a similar libtool > > error message, or suggested a way to get around a similar libtool > > error but none seemed to be about using stow to install subversion > > *and* having the above error. Here are a few threads I came across: > > > > - http://svn.haxx.se/dev/archive-2003-04/0304.shtml > > - http://svn.haxx.se/users/archive-2004-03/0599.shtml > > - http://svn.haxx.se/dev/archive-2003-03/1839.shtml > > > > Thank you in advance for you help, > > Eric Dramstad > > >
Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11
On 15.03.2016 13:38, Nico Kadel-Garcia wrote: > On Mon, Mar 14, 2016 at 11:43 AM, Eric Dramstad wrote: >> Is there a right way to install subversion 1.9.3 using GNU Stow? >> >> I use stow to manage package installation for packages that I build >> myself. I'm trying to build and install subversion 1.9.3 on a machine >> running Red Hat Enterprise Linux (RHEL) 5.11. I'm building subversion >> myself because the newest version available from yum is 1.6.11. > Don't hurt yourself trying to do that. The build dependencies have > gotten too far ahead of the base components for RHEL 5 for even me, > and I published the last update for Repoforge. Save yourself some pain > and take a look at Wandisco's public offerings if you need to run the > server on RHEL 5, or stell yourself for the jump tp RHEL 6 or RHEL 7. In order to avoid any nasty surprises down the road, I'll point out that WANdisco no longer employs any Subversion developers. I have no idea how this may affect the availability of their binary packages in future. -- Brane
try to revert from a bad merge but get error result
Something wrong after I commit my merge from a branch to trunk. Now the version number is 689 and the previous is 687 in the trunk tree.I followed the online suggestions did the following from my trunk working copy directory:svn up svn merge -r 689:687 . and svn up svn merge -c -687 . both above give me an error result:svn: E155035: Can't merge into conflicted node '/locationToAFile/fileName.java' search online but cannot find direct answer for this. can you tell me how to resolve above error and let me continue the revert? Thanks,James
Can I combine 'complete' and 'cherry-pick' merges?
Is it safe/correct to do a combination of a 'complete' merge and a 'cherry-pick' merge to reintegrate a feature branch? I've only ever done a 'complete' merge of a feature branch. For this project, several of the changesets from the branch contain a mix of things I want to merge into the trunk and things I want to leave on the branch. For example, the version identifier that gets inserted into compiled software was modified after branching so that builds would identify themselves as special. I'm thinking of doing this (while standing inside a trunk workarea): svn merge ^/feature svn merge -c -100 ./file.c svn merge -c -101 ./file.h svn commit -m 'reintegrated feature' Thanks, Eric Dramstad
svn: E155035: The node ... has a status that has no properties.
I am trying to revert a bad merge and get the following: $ svn merge -r 689:687 .. --- Recording mergeinfo for reverse merge of r689 through r688 into '.': Summary of conflicts: Tree conflicts: 13 svn: E155035: The node '/home/bowing/1-workspace/OC/trunk/latest/resources/images/scheduledPatientList/bmDelete.png' has a status that has no properties. [user1@devserver scheduledPatientList]$ svn status where the file located A + C . > local dir obstruction, incoming dir add upon merge D + bmDelete.png Summary of conflicts: Tree conflicts: 1 [user1@devserver images]$ svn status where the folder located A + C scheduledPatientList > local dir obstruction, incoming dir add upon merge D + scheduledPatientList/bmDelete.png D C worklist > local dir delete, incoming dir delete upon merge D worklist/bmCalendar.png D worklist/bmRefresh.png D worklist/bmSearch.png Summary of conflicts: Tree conflicts: 2 how can I resolve the conflicts? $ svn --version svn, version 1.8.11 (r1643975) compiled Dec 16 2014, 13:31:09 on x86_64-redhat-linux-gnu Thanks,James
Re: Can I combine 'complete' and 'cherry-pick' merges?
Eric Dramstad gmail.com> writes: > I'm thinking of doing this (while standing inside a trunk workarea): > > svn merge ^/feature > svn merge -c -100 ./file.c > svn merge -c -101 ./file.h > svn commit -m 'reintegrated feature' That should have been: svn merge ^/feature svn merge -c -100 ^/feature/file.c ./file.c svn merge -c -101 ^/feature/file.h ./file.h svn commit -m 'reintegrated feature' I also should have mentioned that I'm using subversion 1.9.3.
Re: Compilation of Subversion on Windows Server 2008 is failing
subhadarsan das wrote on Tue, Mar 15, 2016 at 11:09:29 +: > Hi Team, > We are trying to install subversion 1.9.3 on Windows 2008 Server with Apache > Haus 2.4 which already has APR and OpenSSL compiled into it. We however have > ignored the optional packages and sticking to core packages only. We have > Visual Studio 2015 Community Edition installed on our machine. > > However, after running 'python gen-make.py --vsnet-vesion=2015' we still are > not getting the subversion_vcnet.sln created. Output of the gen-make.py > reports this warning message: > > "WARNING: errno intersects APR error codes: ..." > There are few numeric codes that are reported with the above warning. > Any help would be appreciated. Also, please let us know if you need more > information. This warning means, that when svn prints an error message of the form "svn: E02 (errno=ENOENT)", where 02 is one of the numeric values printed in the error message, the numeric value will be correct but the symbolic value "ENOENT" part might be wrong, since two different symbols map to the same numeric value. The warning is, in fact, possibly premature: it happens whenever the Python and APR data sources define a mapping for the same numeric value, but doesn't check whether the mapped string values are different. I've now fixed both of these issues: https://svn.apache.org/r1735179 That warning by itself is mostly harmless, and isn't what stops your *.sln file from being created. That said, I don't know whether that warning is normal in windows builds or indicative of some deeper problem. Cheers, Daniel > Regards,Subha
