- 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 2013 06:08
To: Gavin Baumanis; users
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
.
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 production release
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
Hi Konstantin,
Thanks for the reply.
On 30/09/2011, at 5:31 PM, Konstantin Kolinko wrote:
2011/9/30 Gavin Baumanis gav...@thespidernet.com:
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
: 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 subversion repository.
Prior to this we just use the private LAN IP address to access the repo via
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
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;
in one / special) first.
You never know what gems are hiding in there - if you don't ask.
As always - a big thanks for the assistance
Gavin Beau Baumanis
On 23/06/2011, at 10:48 PM, Daniel Shahaf wrote:
Konstantin Kolinko wrote on Thu, Jun 23, 2011 at 11:48:46 +0400:
2011/6/23 Gavin
