I wanted to describe our branching and merging strategy and hopefully get
some feedback. We are using Subversion Server 1.6.
Currently we manage trunk plus up to 3 other branches:
trunk: always represents "what's in production"
1.0.0, 2.0.0, etc: represent long-term
ches are what types. It is just in the merging patterns used. You are
> left to keep track of that by naming schemes, etc.
>
>>
>> Thanks
>> Mar
>
> Hope that helps.
> -Steve
>
>> -Original Message-
>> From: Varnau, Steve (Seaquest R&
As a follow-up, strategy #2 seems to describe what my team is doing:
http://blogs.collab.net/subversion/2007/11/branching-strat/
leojhartiv wrote:
>
> Thanks for your responses!
>
> I guess the part I'm missing is how you would support hotfixes, etc? If I
> don't a
We have an automated build process (enabled via jenkins) that creates a
nightly tag and uses that tag to deploy the latest and greatest version of
our app to SIT. Here are there we are getting a "file or directory is out
of date" error. I find this confusing as I'm performing an SVN copy, which
My guess is that this is what's happening (in my case):
I have two nightly build processes creating tags. #1 and #2 both run at
around the same time. Perhaps #2 starts while #1 is still running and then
Subversion tells us that something is changed (optimistic locking).
There are probably 2 way
