Return-Path: X-Original-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A65BBEA07 for ; Thu, 22 Nov 2012 12:59:16 +0000 (UTC) Received: (qmail 73471 invoked by uid 500); 22 Nov 2012 12:59:15 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 73300 invoked by uid 500); 22 Nov 2012 12:59:15 -0000 Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-dev@incubator.apache.org Received: (qmail 73280 invoked by uid 99); 22 Nov 2012 12:59:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2012 12:59:15 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [209.85.216.47] (HELO mail-qa0-f47.google.com) (209.85.216.47) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2012 12:59:09 +0000 Received: by mail-qa0-f47.google.com with SMTP id t11so978275qaa.6 for ; Thu, 22 Nov 2012 04:58:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding:x-gm-message-state; bh=0GiJODcw6sFNGJoGd5vW5S2LhC+4PZrblS5jQcptyRo=; b=W/tbuf6hjYGyWJ10Ry6QMsZFZ2l/s8z+LSxthY4j0yAjGuM87EDsj08/u5OQJmfEhD GjIs0bY/DXApBTXRC7gTPeaVP+8nNhi61czPjuwLd7JpfcEGBJRO8VNg5kuSDFA0XEUW MLe9hsZHG9tOBNaVSwA9A/i0tot86h47kr850hAxFWKax7iy18aF8mHp50/XqxbjaOuc uWPFIN4/QuNL5D8/3rHNZ/n89uZCsYPBsd7B1+rQPhrOdRL3puPvO/mp/FtL9LkGnR4J S9LMC1isrqUs4TgiLxKTHc8Y+wB2EAJoAJEstd5xhJBFyQ5coPeY0V7/GsElYk9UT+1b 8u7g== MIME-Version: 1.0 Received: by 10.224.188.81 with SMTP id cz17mr1136897qab.74.1353589127632; Thu, 22 Nov 2012 04:58:47 -0800 (PST) Received: by 10.49.127.148 with HTTP; Thu, 22 Nov 2012 04:58:47 -0800 (PST) In-Reply-To: References: Date: Thu, 22 Nov 2012 13:58:47 +0100 Message-ID: Subject: Re: write access to cms From: Erik de Bruin To: "flex-dev@incubator.apache.org" Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQlSHk6OaRHVuuSUecYndFwiSK788Q/29JmbuJeeS0Xc67GyHAAFjlRAmFLyfvzjsyBidDHT X-Virus-Checked: Checked by ClamAV on apache.org Jose, Frederic, Thank you for those explanations. EdB On Thu, Nov 22, 2012 at 1:28 PM, Jose Barragan wrote: > Hi Erik, > > As I did explain in older's emails, the workflow in Git it's really simpl= e, let me show you it: > > You only need in essential commit and push against the remote repository,= but you could compose the commit contain using the stage area, it will don= e in only one step if you wish that. > Your local repository must be updated making pull over your local "develo= p" branch, and your work for tickets, experiments, features, etc... must be= done in topic branches derived from your clean branch "develop". > Your local topic branches must contain only your work and it's lifecycle = exist only for a specific feature, until it's finished, at this moment you = need merge your work with develop to push up to public remote repository, f= or this process you must before update your local branch develop from remot= e, and later merge it over your topic branch, this process cause your branc= h upgrade and made it mergeable over develop, and then only rest make a pus= h on develop to publish all work in remote. > > When we talking about Pull-Request we done in order to Non-Official-Commi= tters contributors, that may fork our remote repository, and contribute mak= ing a pull-request against our repo, where any committer (or whatever role = you decided) can evaluate the contribution and admit or discard it from-to = our work branch/es . > > That it's, more or less.. > > Best, > -- > Jose Barragan > Software Architect Chief > Codeoscopic Madrid > C/. Infanta Mercedes, 92. > Planta 5. 505. > 28020 Madrid. > Tel.: +34 912 94 80 80 > > On Nov 22, 2012, at 12:46 PM, Erik de Bruin wrote: > >> Ok, while we're on the subject=85 I did read all those articles, as they >> came up around the time of the vote. I watched some tutorial all over >> the web, including the one at Lynda.com. I'm still not sure about the >> workflow part, though. I have a feeling I need to do a bunch more >> steps on Git, than I need to do in SVN. As far as I understand, I need >> to stage, commit and "pull request" in Git, while in SVN a commit is >> enough. And I'm entirely in the dark how I keep my local branch up to >> date with the latest and greatest from the develop branch or trunk. Do >> I need to process all pull requests to these branches locally? How do >> I know what is available for me to play with (whiteboards etc.)? Is >> there a central place where all branches/copies etc. are documented? >> >> Lot's of questions, as you can see. Probably why I'm having a hard >> time accepting that this something that's good for the project. But as >> I said, I'll shut up now ;-) >> >> EdB >> >> >> >> On Thu, Nov 22, 2012 at 12:23 PM, Carlos Rovira >> wrote: >>> After you have some git knowledge, our voted branching strategy is in t= his >>> simple blog post >>> >>> http://nvie.com/posts/a-successful-git-branching-model/ >>> >>> That's is all and resume the way people use GIT efficiently. >>> >>> If you use SourceTree on MAC (a free git client) you'll see that it >>> integrates this as GitFlow (gitflow is the official project behind this >>> workflow) >>> >>> We use it at work and we are very happy with the flexibility and commod= ity >>> of the process. People here remember the SVN days as something of the p= ast. >>> >>> >>> >>> 2012/11/22 Fr=E9d=E9ric THOMAS >>> >>>> lol, you can start here http://sixrevisions.com/**resources/git-tutori= als- >>>> **beginners/ :-) >>>> >>>> >>>> - Fred. >>>> >>>> -----Message d'origine----- From: Erik de Bruin >>>> Sent: Thursday, November 22, 2012 12:02 PM >>>> >>>> To: flex-dev@incubator.apache.org >>>> Subject: Re: write access to cms >>>> >>>> Redone (and no worries about "wasting my time", trying stuff is the >>>> only way to learn new things=85 you should see me after the switch to >>>> Git, I'm a total noob, I probable won't get anything done for weeks or >>>> months ;-) >>>> >>>> EdB >>>> >>>> >>>> On Thu, Nov 22, 2012 at 11:57 AM, Fr=E9d=E9ric THOMAS >>>> wrote: >>>> >>>>> Cheers Erik, can you please redo it as I just changed it agin to comp= lete >>>>> my >>>>> info :$ >>>>> I'll pay more attention from now as I have to ask someone to publish = it >>>>> and >>>>> I don't want to waste its time. >>>>> >>>>> - Fred. >>>>> >>>>> -----Message d'origine----- From: Erik de Bruin >>>>> Sent: Thursday, November 22, 2012 11:42 AM >>>>> >>>>> To: flex-dev@incubator.apache.org >>>>> Subject: Re: write access to cms >>>>> >>>>> @Frederic: published >>>>> >>>>> To all committers who can't publish (for whatever reason): feel free >>>>> to drop me a (private) email requesting a publish, I'll do it asap. >>>>> >>>>> EdB >>>>> >>>>> >>>>> >>>>> On Thu, Nov 22, 2012 at 11:36 AM, Carlos Rovira >>>>> wrote: >>>>> >>>>>> >>>>>> Ok, if I don't have to grants on CMS it's ok for me. If I should cha= nge >>>>>> something I'll ask for some (P)PMC help here. I just trying to test = that >>>>>> all is setup ok for me. >>>>>> >>>>>> 2012/11/22 Bertrand Delacretaz >>>>>> >>>>>> On Thu, Nov 22, 2012 at 11:24 AM, Carlos Rovira >>>>>>> wrote: >>>>>>>> ...that's right, I tried that and that's ok. SVN committing is ok = in >>>>>>> global. >>>>>>>> The only problem right now is CMS publishing... >>>>>>> >>>>>>> Publishing might be restricted to (P)PMC members, you might want to >>>>>>> check with infrastructure@a.o. >>>>>>> >>>>>>> -Bertrand >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Carlos Rovira >>>>>> Director de Tecnolog=EDa >>>>>> M: +34 607 22 60 05 >>>>>> F: +34 912 35 57 77 >>>>>> http://www.codeoscopic.com >>>>>> http://www.directwriter.es >>>>>> http://www.avant2.es >>>>>> >>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Ix Multimedia Software >>>>> >>>>> Jan Luykenstraat 27 >>>>> 3521 VB Utrecht >>>>> >>>>> T. 06-51952295 >>>>> I. www.ixsoftware.nl >>>>> >>>> >>>> >>>> >>>> -- >>>> Ix Multimedia Software >>>> >>>> Jan Luykenstraat 27 >>>> 3521 VB Utrecht >>>> >>>> T. 06-51952295 >>>> I. www.ixsoftware.nl >>>> >>> >>> >>> >>> -- >>> Carlos Rovira >>> Director de Tecnolog=EDa >>> M: +34 607 22 60 05 >>> F: +34 912 35 57 77 >>> http://www.codeoscopic.com >>> http://www.directwriter.es >>> http://www.avant2.es >> >> >> >> -- >> Ix Multimedia Software >> >> Jan Luykenstraat 27 >> 3521 VB Utrecht >> >> T. 06-51952295 >> I. www.ixsoftware.nl > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl