Re: Branch issue

2015-05-04 Thread Branko Čibej
On 04.05.2015 14:14, Jan De Luyck wrote: > Hello folks, > > Perhaps a stupid subversion question, but one i haven't been able to > figure out yet: > > I've got two scripts in the same directory, which are basically > variants - one for RHEL6, one for RHEL7. Most of the content will be > the same, w

Re: Branch issue

2015-05-04 Thread Jan De Luyck
> *From:* Jan De Luyck > *To:* users@subversion.apache.org > *Sent:* Monday, May 4, 2015 8:14 AM > *Subject:* Branch issue > > Hello folks, > > Perhaps a stupid subversion question, but one i haven't been able to > figure out yet: > > I've go

Re: Branch issue

2015-05-04 Thread KM
gh.KM   From: Jan De Luyck To: users@subversion.apache.org Sent: Monday, May 4, 2015 8:14 AM Subject: Branch issue Hello folks, Perhaps a stupid subversion question, but one i haven't been able to figure out yet: I've got two scripts in the same directory, which are basically vari

Branch issue

2015-05-04 Thread Jan De Luyck
Hello folks, Perhaps a stupid subversion question, but one i haven't been able to figure out yet: I've got two scripts in the same directory, which are basically variants - one for RHEL6, one for RHEL7. Most of the content will be the same, with small changes here and there. The files are named a

RE: Reintegrate a branch issue

2010-05-25 Thread Erik Hemdal
1) When I attempt to reintegrate, I am getting the following error: Error: Retrieval of mergeinfo unsupported by '...my repo path...'. The research that I've done suggested I need to upgrade my server version of Subversion, but I would like to avoid doing this because of the corporate red

RE: Reintegrate a branch issue

2010-05-24 Thread Bob Archer
t have an option to work successfully with older > server versions. What kind of advantages does merge tracking offer? > > -Original Message- > From: Régis Décamps [mailto:deca...@users.sf.net] > Sent: Saturday, May 22, 2010 5:21 AM > To: users@subversion.apache.org > Su

RE: Reintegrate a branch issue

2010-05-22 Thread Michael Cole
ers.sf.net] Sent: Saturday, May 22, 2010 5:21 AM To: users@subversion.apache.org Subject: Re: Reintegrate a branch issue On 21 mai, 23:57, "Michael Cole" wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the t

Re: Reintegrate a branch issue

2010-05-22 Thread Régis Décamps
On 21 mai, 23:57, "Michael Cole" wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the trunk.  My question is two-fold: > > 1)      After reintegration, I can delete my branch, correct? Yes indeed. In the worse case, we can still check out

Reintegrate a branch issue

2010-05-21 Thread Michael Cole
Hello, I created a development branch and I'm trying to reintegrate that branch back into the trunk. My question is two-fold: 1) After reintegration, I can delete my branch, correct? 2) When I attempt to reintegrate, I am getting the following error: Error: Retrieval of mergeinfo u