Re: Compilation of Subversion on Windows Server 2008 is failing

2016-03-15 Thread Daniel Shahaf
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 onl

Re: Can I combine 'complete' and 'cherry-pick' merges?

2016-03-15 Thread Eric Dramstad
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

svn: E155035: The node ... has a status that has no properties.

2016-03-15 Thread James
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/scheduledPat

Can I combine 'complete' and 'cherry-pick' merges?

2016-03-15 Thread Eric Dramstad
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 an

try to revert from a bad merge but get error result

2016-03-15 Thread James
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

Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11

2016-03-15 Thread Branko Čibej
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 subversio

Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11

2016-03-15 Thread Eric Dramstad
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 Wandisc

Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11

2016-03-15 Thread Eric Dramstad
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

Re: Problems building subversion 1.9.3 as required for use with GNU Stow on RHEL 5.11

2016-03-15 Thread Nico Kadel-Garcia
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 Li

Compilation of Subversion on Windows Server 2008 is failing

2016-03-15 Thread subhadarsan das
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 mach