RE: Merging change sets for a production release,

that file - there was no mergeinfo recorded for that revision. Do I need to do a --record-only "post" merge when there is a conflict? As always - thanks, - Gavin. > -Original Message- > From: Andrew Reedick [mailto:andrew.reed...@cbeyond.net] > Sent: Tuesday, 4 June 20

RE: Merging change sets for a production release,

. Perhaps simply chaining the merge revisions is the answer? > -Original Message- > From: Andrew Reedick [mailto:andrew.reed...@cbeyond.net] > Sent: Tuesday, 4 June 2013 00:48 > To: Gavin Baumanis; users@subversion.apache.org > Subject: RE: Merging change sets for a pro

Merging change sets for a production release,

Hi Everyone, At the moment we do all of our work on /trunk and also have /branches/releases/1.0 When we have enough issues, we mark the ready / required issues with a new release milestone and I go about the task of merging the required changes from trunk to the release branch. Here is what I

Re: Release branch merging.

rks as expected - and updates my feature branch with all changes made in > trunk - since the last trunk->feature branch merge operation. > > Why is it not working for me in the other directory / branch? > > > As always - thanks in advance! > > > Gavin. > > > O

Release branch merging.

Hi There everyone, I have trunk, branches and tags. (the "default" repo setup) VERY recently we swapped from continuous deployment to having a scheduled release strategy. We used to simply cherry-pick or even just OS copy the required changes from trunk to a "special"(to us) branch any change

Re: Authentication realm

her server… > > Bert > > From: Gavin Baumanis [mailto:gav...@thespidernet.com] > Sent: vrijdag 30 september 2011 5:14 > To: Subversion Users > Subject: Authentication realm > > Hi Everyone, > > We recently created a DNS entry for our subversio

Re: Authentication realm

Hi Konstantin, Thanks for the reply. On 30/09/2011, at 5:31 PM, Konstantin Kolinko wrote: > 2011/9/30 Gavin Baumanis : >> Hi Everyone, >> We recently created a DNS entry for our subversion repository. >> Prior to this we just use the private LAN IP address to access the rep

Authentication realm

Hi Everyone, We recently created a DNS entry for our subversion repository. Prior to this we just use the private LAN IP address to access the repo via http (Apache) Post the change to having a hostname to use I created a new branch - and used the host name to do this. Subsequently when I perf

Ignore development changes.

Hi Everyone, I am just after some advice on how other people solve the following issue. I have a committed file. When it is deployed, it needs to be in a state (lets call it state 1) While testing code locally, it needs to be in some other state (state 2) Short of altering the code to read like;

Re: Exclude a directory from a copy.

ahaf wrote: > Konstantin Kolinko wrote on Thu, Jun 23, 2011 at 11:48:46 +0400: >> 2011/6/23 Gavin Baumanis : >>> Hi there everyone, >>> >>> I am just wondering if there is a short-hand way of excluding a directory >>> from a copy? >>> >

Exclude a directory from a copy.

Hi there everyone, I am just wondering if there is a short-hand way of excluding a directory from a copy? I am wanting to create a branch from the trunk - but omit a specific directory from the copy as it contains about 1GB of binary data that are not required for the work that will be occurri