RE: Merging fixes from a branch?

2016-03-21 Thread Cooke, Mark
> -Original Message- > From: Watson, Paul [mailto:pwat...@phs.org] > Sent: 21 March 2016 15:45 > > We are using Subversion 1.7. I am trying to document a hotfix methodology. > The project has the traditional "TTB" directories. > > app/trunk > app/tags/1.0 > app/tags/1.1 > app/branches >

Re: Upgrade Subversion from 1.5 to 1.9

2016-03-21 Thread Nico Kadel-Garcia
On Mon, Mar 21, 2016 at 3:58 PM, Stefan Sperling wrote: > On Mon, Mar 21, 2016 at 10:33:49AM -0700, Safarulla Meerasahib wrote: >> Hi, >> >> >> >> We have recently taken over a production application from other team, which >> uses the SVN 1.5.0 as one of the component. Now we have a requirement

Re: Upgrade Subversion from 1.5 to 1.9

2016-03-21 Thread Daniel Shahaf
Stefan Sperling wrote on Mon, Mar 21, 2016 at 20:58:37 +0100: > On Mon, Mar 21, 2016 at 10:33:49AM -0700, Safarulla Meerasahib wrote: > > Hi, > > > > > > > > We have recently taken over a production application from other team, > > which uses the SVN 1.5.0 as one of the component. Now we have

Re: Merging fixes from a branch?

2016-03-21 Thread Stefan Sperling
On Mon, Mar 21, 2016 at 03:44:43PM +, Watson, Paul wrote: > We are using Subversion 1.7. I am trying to document a hotfix methodology. > The project has the traditional "TTB" directories. > > app/trunk > app/tags/1.0 > app/tags/1.1 > app/branches > > 1.1 is deployed and running in production

Re: Upgrade Subversion from 1.5 to 1.9

2016-03-21 Thread Stefan Sperling
On Mon, Mar 21, 2016 at 10:33:49AM -0700, Safarulla Meerasahib wrote: > Hi, > > > > We have recently taken over a production application from other team, which > uses the SVN 1.5.0 as one of the component. Now we have a requirement to > upgrade this to latest version of the subversion. > >

Re: Upgrade Subversion from 1.5 to 1.9

2016-03-21 Thread jblist
> On Mar 21, 2016, at 10:33 AM, Safarulla Meerasahib > wrote: > > Hi, > > We have recently taken over a production application from other team, which > uses the SVN 1.5.0 as one of the component. Now we have a requirement to > upgrade this to latest version of the subversion. > While going

Merging fixes from a branch?

2016-03-21 Thread Watson, Paul
We are using Subversion 1.7. I am trying to document a hotfix methodology. The project has the traditional "TTB" directories. app/trunk app/tags/1.0 app/tags/1.1 app/branches 1.1 is deployed and running in production when a problem occurs. We cannot tag the current trunk and deploy since develo

Upgrade Subversion from 1.5 to 1.9

2016-03-21 Thread Safarulla Meerasahib
Hi, We have recently taken over a production application from other team, which uses the SVN 1.5.0 as one of the component. Now we have a requirement to upgrade this to latest version of the subversion. While going through the Apache subversion link we have noticed that Subversion 1.9 can

wc_db.c line 10235: assertion failed

2016-03-21 Thread frodo . hobbit
I want to set an external reference to a relative project path, which does not contain spaces (googling the assertion gave a hint that spaces can be involved into creating this assertion). I can enter the path but once I press the context menu entry "Fetch HEAD revision and adjust to it", I get

Re: mod_dav_svn: nested Location '/svn' hinders access to '' in SVNPath Location '/svn'

2016-03-21 Thread Daniel Shahaf
Manju C wrote on Mon, Mar 21, 2016 at 05:17:01 -0700: > "mod_dav_svn: nested Location '/svn' hinders access to '' in SVNPath > Location '/svn'" It means you have two directives, either two or a and a , that both contain a "DAV svn" directive.

Re: What branching patterns work with Subversion reintegrate merge?

2016-03-21 Thread Stefan Sperling
On Mon, Mar 21, 2016 at 02:23:06PM +, Bob Berger wrote: > Thanks for your reply Stefan. It's very much appreciated. > > Before Subversion 1.8 made the reintegrate merge automatic, I was doing > merges without the reintegrate option, which were, I suppose, inappropriate > "complete merges". T

Re: What branching patterns work with Subversion reintegrate merge?

2016-03-21 Thread Bob Berger
Thanks for your reply Stefan. It's very much appreciated. Before Subversion 1.8 made the reintegrate merge automatic, I was doing merges without the reintegrate option, which were, I suppose, inappropriate "complete merges". They were generally effective, but sometimes produced errors and stran

mod_dav_svn: nested Location '/svn' hinders access to '' in SVNPath Location '/svn'

2016-03-21 Thread Manju C
Hi Team, We recently upgraded subversion from 1.6 version to 1.8 version on RHEL 5.8. After upgrade we are getting below warning in error_log file and we are getting access denied error when we try to access projects thru URL and forbidden error when we checkout using client. Before upgrade everyt