Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:73601
Return-Path: <indeyets@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 90829 invoked from network); 5 Apr 2014 07:20:00 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 5 Apr 2014 07:20:00 -0000
Authentication-Results: pb1.pair.com header.from=indeyets@gmail.com; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=indeyets@gmail.com; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.217.171 as permitted sender)
X-PHP-List-Original-Sender: indeyets@gmail.com
X-Host-Fingerprint: 209.85.217.171 mail-lb0-f171.google.com  
Received: from [209.85.217.171] ([209.85.217.171:47601] helo=mail-lb0-f171.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id B8/01-16521-E9EAF335 for <internals@lists.php.net>; Sat, 05 Apr 2014 02:19:59 -0500
Received: by mail-lb0-f171.google.com with SMTP id w7so3223794lbi.30
        for <internals@lists.php.net>; Sat, 05 Apr 2014 00:19:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=content-type:mime-version:subject:from:in-reply-to:date:cc
         :message-id:references:to;
        bh=h+0zCahNAP1y55OLS3oUKFkQQz/OrONsFQdPoCGZnfM=;
        b=gZCH2QhNczP5QJ9XRvsShU9kDonOOOixXiPdHzPIKByAMjMYv0CZVztZQTHK057xn5
         Ssm9+KQsAPDmYjq6QobCqpuroi1CDAbHf8jH6Ux6f5SHid9m6KYv1xQTxxCS7TZsvL1R
         wMFGBx7BVxALSjhUcP+kja6zwqomEu7/O7IP3SN1XdOqAbawR5jUiMWq48O1iG0Z9a5U
         5Mkm5L+tjgpUqy6tRFzY5GLgtPAWZ99ohemQbtPqau+WnKEd4K9GZzncs7z2Toea//zW
         N8wXm77GRsL/KaXR4IRHVVc/s2Ra3+kBfHXXANaXrJ/xPJOQOh0aX12L3huzgNNTZyss
         D9Rg==
X-Received: by 10.112.94.229 with SMTP id df5mr577637lbb.36.1396682396071;
        Sat, 05 Apr 2014 00:19:56 -0700 (PDT)
Received: from [10.0.1.8] ([46.252.161.106])
        by mx.google.com with ESMTPSA id eo12sm7215469lbb.13.2014.04.05.00.19.53
        for <multiple recipients>
        (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
        Sat, 05 Apr 2014 00:19:54 -0700 (PDT)
Content-Type: multipart/signed; boundary="Apple-Mail=_1DA450D2-05A0-405A-8C01-D8EBC4776134"; protocol="application/pgp-signature"; micalg=pgp-sha512
Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\))
In-Reply-To: <533F9C11.9000303@sugarcrm.com>
Date: Sat, 5 Apr 2014 11:19:43 +0400
Cc: Kris Craig <kris.craig@gmail.com>,
 =?iso-8859-1?Q?Johannes_Schl=FCter?= <johannes@schlueters.de>,
 Julien Pauli <jpauli@php.net>,
 PHP Internals <internals@lists.php.net>
Message-ID: <688A2215-A79A-417B-8E7A-76CF03DF9F35@gmail.com>
References: <CAMUwpuQZrHBVkipgfbtaPxwUqGBGoX=AgAJrzXWCS5GATQcsbA@mail.gmail.com>	<CAKOpQSwZ9-NNwHMSt2rrMw7s63bxf7+NYtAeDC-F=BDy+YVXTg@mail.gmail.com>	<1396523991.2982.340.camel@guybrush>	<CAKOpQSw4CpaZLdB0tkeorwnO+Ax9aYqFmMYasxwRwDLok8BZZw@mail.gmail.com>	<1396527638.2982.350.camel@guybrush> <CAKOpQSw9=CgNcfS16=HccKDwKRo_oee_dv9LsDt_JoLyq3i2+Q@mail.gmail.com> <533F9C11.9000303@sugarcrm.com>
To: Stas Malyshev <smalyshev@sugarcrm.com>
X-Mailer: Apple Mail (2.1874)
Subject: Re: [PHP-DEV] Branching PHP6
From: indeyets@gmail.com (Alexey Zakhlestin)

--Apple-Mail=_1DA450D2-05A0-405A-8C01-D8EBC4776134
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=windows-1252


On 05 Apr 2014, at 10:00, Stas Malyshev <smalyshev@sugarcrm.com> wrote:

> makes it a nightmare to read.  Furthermore, there's simply no need to =
have
>> an ever-increasing number of dead branches that lead nowhere and =
never
>> merge back.  If somebody wants to find a specific version, that's =
what tags
>=20
> Branches are dirt-cheap in git, so dead branches is not a problem. =
Also,
> the only dead branches are supposed to be release branches and very
> rarely feature branches, all the rest should be done in private =
branches
> and submitted as pull request.

The usual git workflow which I=92ve seen in the wild is:

1. release branch is created
2. release-specific commits are added
3. tag (optionally signed) is created
4. branch is removed

In case development has to be restarted (for hotfix-patch), new branch =
is created from the tag-point.

The advantage is, that =93branches=94 represent points of active =
development and tags represent history.
Advantage is purely semantical, of course

--=20
Alexey Zakhlestin
CTO at Grids.by/you
https://github.com/indeyets
PGP key: http://indeyets.ru/alexey.zakhlestin.pgp.asc




--Apple-Mail=_1DA450D2-05A0-405A-8C01-D8EBC4776134
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQEcBAEBCgAGBQJTP66XAAoJEMkJcRxZdR27Z7cH/i/CBsgTY6hdM32mGdG1L4Rn
bqhxAzg/KGAzSwmS9n2E5n5NiMVPHcP8Qo6gzyfmmtVWS+69rqD4AUOkkvrFZwLL
jQ208hZbPHfkVLVEejfYw/T3DWdUF15gh91tBIigBmEGffLWwhDTQAalu8lK+5hA
LsVQLXZHrgATc88gyP8IJB0PbZogza3rAUncXNzxQ6M4i08ZsAjOrC6nnDtt/usF
+CPFvyUx3m3HoWr2WJZnWphXYJvzJ1MakAp7FkrtgAwDeXniJdSOVIhiJr5kZFrh
7yp5t27uExl5QShDRcax5KGGWEp8pm++U2w6hPGHTHovboFRlMf19meigrepWRA=
=vNMD
-----END PGP SIGNATURE-----

--Apple-Mail=_1DA450D2-05A0-405A-8C01-D8EBC4776134--