Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:58590
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <4F53DF00.6070303@gmx.net>
References: <slrnjl54vo.mfm.dsp@experimentalworks.net>
	<4F5336B2.3040200@kukulich.cz>
	<4F53DF00.6070303@gmx.net>
Date: Sun, 4 Mar 2012 14:41:29 -0800
Message-ID: <CAKOpQSwkwbc3eFpJjDpe89AAuYNAqusVG8ozi7APydLP3Gb+0w@mail.gmail.com>
To: David Soria Parra <dsoria@gmx.net>
Cc: Jaroslav Hanslik <konference@kukulich.cz>, internals@lists.php.net, 
	David Soria Parra <dsp@php.net>
Content-Type: multipart/alternative; boundary=f46d043be1c6b98e9d04ba728271
Subject: Re: [PHP-DEV] Re: Git Migration: Status Update
From: kris.craig@gmail.com (Kris Craig)

--f46d043be1c6b98e9d04ba728271
Content-Type: text/plain; charset=ISO-8859-1

I was about to respond to Lester's comments but it looks like Jeremiah beat
me to it (again).  Yeah he's correct in that "bad habits" refers to using
Git the same way you would use Subversion.  It was not mean to refer to how
you've used Subversion itself.

@David Generally, I would resolve this by having an intermediary branch
intended solely for such collisions.  For example:

git checkout PHP_5.3
(git commits)
git checkout PHP_5.4
(git commits)
git checkout PHP_5.3-5.4_bridge
git merge --no-ff PHP_5.3
git merge --no-ff PHP_5.4
(resolve merge conflicts, if any)
git checkout PHP_5.4
git merge --no-ff PHP_5.3-5.4_bridge
(then, when it's time for a major release; which is the only time master
should ever be used....)
git checkout -b Release-(version number) PHP_5.4
(any last-minute release commits; basically, each commit is a release
candidate)
git checkout master
git merge --no-ff Release-(version number)
git checkout PHP_5.4
git merge --no-ff Release-(version number)
git branch -d Release-(version number)


The above approach would allow for David's scenario of merging 5.3 changes
into 5.4 without disrupting development on either branch in the event of
merge conflicts, simultaneous commits, etc.

I could probably draft something a little more comprehensive if anyone's
interested.

--Kris


On Sun, Mar 4, 2012 at 1:30 PM, David Soria Parra <dsoria@gmx.net> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 03/04/2012 10:32 AM, Jaroslav Hanslik wrote:
> >>
> >> (3) Karma system fixes. Already done by me. People who have
> >> access to the root of a repository are able to do forced pushes.
> >>
> >
> >
> > Do you think it's good idea not to forbid forced pushes at all?
> No. We will always need to be able to delete branches created, or tags
> (we had situations were we needed to retag, for example). That in
> itself can be used to do a forced push:
>
>  git push :master && git push mynewmaster:master
>
> Will be equal to
>
>  git push +mynewmaster:master
>
> equal to
>
>  git push --force mynewmaster:master
>
> I am also not a strong believer trying to forbid as much as possible.
> If you have an SVN account you are trusted enough to not just delete
> something that is used. Also thanks to the decentralized model of git
> we all have backups, so we can just recreate it.
>
> David
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iQIcBAEBAgAGBQJPU98AAAoJEAT0aMuPE7Z1SM8P/1eN+edqsqoMPukCZfeeWbFm
> DM4wRS1UYyc4WZ2LrUi/6+hadgEk4QZLwkLiZPw+CuYwlGtkRhIoPWskV3HK4xT9
> HqdMeHxTxEAjsq0dnb37hklSGc2LlTFRnUhCHkrZdGb4OZEjOXeQBVa8ud/32Exa
> Cjxcyrmrzdxzu65W1P203zjAwo4jCR24PgWw4qhAqqI4UNYuHhgmIvptOo0MMvZV
> bkZ2GzKDsZladGG+mVwHdxZNwPOU9CxFnWG36wX7tl11uX80M+4WMTTJ43T1kpif
> ZhqbUrUWwitaZfdLBE9apKpwzO09cQdEsY7hgezZNntyH4PmHV+NCvCgz+BBywzM
> ivxNSjvTj8Kt3p4Y63WXOlfdrhTG/65hoZQTMn2Mv3qSIx3lVIqnUc/UFk5WBEI/
> qOBARLGBtqy1ytMTdLLAcYN3cqFKS+zV0ucYIrBClr1LeIuAkIjfXNZ55CILmGy8
> KEwJn6gC495jzV3LK7dw9S0mUiVvraG3IeBsNcJr8OELPZFC/U5IZHO0o1bafXWQ
> I/iqAA2tPeHQ289XyyHRSqL+qQHfDwP75gB0uUcu43lSieu0bNwkCI7IotHtC5vi
> dePV4pzyj+Yjyicx4NcrurWW5BeLafe8l1wvzUNS7SmrtUr3ZMJkj6qIVbVq6hq5
> GvGw6+527FSIwn0TUGC2
> =+P5T
> -----END PGP SIGNATURE-----
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--f46d043be1c6b98e9d04ba728271--