[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Where's backport.txt?

From: Simon Large <slarge_at_slarge.plus.com>
Date: 2005-05-24 11:58:25 CEST

SteveKing wrote:
> 2005/5/24, Lübbe Onken <l.onken@rac.de>:
>
>> I just wanted to merge my doc / translation changes into the 1.2
>> branch, but I haven't found backport.txt in its root. Does this mean:
>> ( ) that it hasn't been created yet and I should go ahead and do it
>
> X

I am still perplexed as to why we need a branch now.

Last year we cut releases directly from trunk a few days after each
subversion release. This led to lots of problems because the new
releases included new and untested features, and usually some regression
bugs.

At 1.1.3, we created a stabilising branch to try to avoid this, which
seemed to work.

Immediately after 1.1.3, Stefan removed MBCS support from trunk, so
1.1.4 and later _had_ to be made from the 1.1.x branch. That also left
trunk free to continue with 1.2 features.

Now we are at 1.2.0 release, we have lots of new features which are
mostly related to 1.2. The nightlies are being well used and we have had
lots of feedback, so testing is improving. If we take the decision not
to add big new features in the next week, then trunk will only contain
bugfixes anyway.

After the 1.2.0 release, Stefan will start on 1.2.1. In Subversion they
will be very conservative and _only_ merge in carefully selected changes
to produce 1.2.1. There will be no new features. For subversion, that is
the right way to go. They _have_ to be that conservative to maintain
reliability.

In TSVN, we don't want to do that. We will almost certainly introduce
new features, so our 1.2.1 will be taken from trunk again, not the 1.2.x
branch.

It seems to me that the only time we need to branch is when there is
significant development going on in trunk that we don't want reflected
in the release. That happens in a few particular situations:
1. Stefan is working on the next Subversion release (1.3?) and needs to
bugfix 1.2.x
2. Stefan is working on a major new feature that isn't ready for release
when the next SVN 1.2.x release comes out.

Maybe I am wrong here, but I think that right now the branch is just a
job creation scheme.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue May 24 11:57:44 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.