Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 5:23 PM, "Om" wrote: > > Are you saying that we should go with SVN while at the same time adopting a > branching strategy like the git branching model? I am not sure SVN can > handle that. > > Om Actually, I voted for #2 which is to use a simpler 3-tier model on SVN until Git com

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/2012 8:23 PM, Om wrote: On Mon, Aug 13, 2012 at 4:48 PM, Alex Harui wrote: SVN doesn't allow you to have more than one branch in your whiteboard? (This is probably tangential to the current discussion) As I understand, in the whiteboard, there is one single folder for each committer.

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Mon, Aug 13, 2012 at 5:19 PM, Gordon Smith wrote: > How does Git make merges better than in SVN? > > - Gordon > > In SVN when you make a branch you can essentially move it to any folder when you choose a location. The /branches folder is the typical target by convention, but you can place it a

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Mon, Aug 13, 2012 at 4:48 PM, Alex Harui wrote: > > > > On 8/13/12 4:08 PM, "Om" wrote: > > > > A committer is free to decide what is unstable and what is complete. > Fast > > branching gives us the flexibility of sharing unstable features with > > others, while keeping develop and master as

RE: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

How does Git make merges better than in SVN? - Gordon -Original Message- From: Omar Gonzalez [mailto:omarg.develo...@gmail.com] Sent: Monday, August 13, 2012 5:12 PM To: flex-dev@incubator.apache.org Subject: Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM > SVN doesn't a

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

>> Sent from my Motorola ATRIX 4G on AT&T >> >> >> -Original message- >> From: Dave Fisher >> To: "flex-dev@incubator.apache.org" >> Sent: Mon, Aug 13, 2012 21:40:03 GMT+00:00 >> Subject: [DISCUSS] Re: [VOTE] Branching Strategy and SC

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> SVN doesn't allow you to have more than one branch in your whiteboard? > Most > of these arguments still seem to be about fear of merge-hell in SVN. Which > is valid, but the logic about when to branch/merge seems to apply to both. > > -- > Alex Harui > Flex SDK Team > Adobe Systems, Inc. > htt

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> > > In the 3-Tier scheme how many buildbots and test rigs are required vs. > the > > work in trunk method? > One CI server for trunk and one for "develop". In either scheme if you cut > a branch I guess you have to add buildbots for them as well? > > > > Don't know why we would need more than on

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

One thing I like about SVN is that it discourages branching to necessary > times while git encourages branching for a whim. > > These are my opinions, it is the project's choice. > > Regards, > Dave > > SVN discourages branching because branching inherently sucks in SVN. Git encourage branching be

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Mon, Aug 13, 2012 at 2:38 PM, Dave Fisher wrote: > > On Aug 13, 2012, at 1:43 PM, Omar Gonzalez wrote: > > > On Mon, Aug 13, 2012 at 1:39 PM, Dave Fisher > wrote: > > > >> My opinion/vote is (4) - no guts, no glory - work in trunk and learn to > >> co-operate. > >> > >> The vote is more about

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 4:08 PM, "Om" wrote: > A committer is free to decide what is unstable and what is complete. Fast > branching gives us the flexibility of sharing unstable features with > others, while keeping develop and master as stable as possible. The > current 'whiteboard' concept is not a re

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> > OK, but even modifications can be done without branching, right? The key > is > not to check things into "develop" that breaks things. > > Other than Git handles branching better, the technical/logistical reasons > for branching are the same in all SCMs, correct? > > Alex, that's ok, and is up

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 4:04 PM, "Carlos Rovira" wrote: > Right! for that reason I said the new planed cases was something never came > to flex before because all work was mainly "additive". > > If you plan to make a new component...you can make it in develop, because > it will not break nothing! since is

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> Normaly, if you are working in a set of spark charts, your work will spawn > > over some weeks. So if you work directly on develop, you should not > commit > > your work to SVN until is done because you will make "develop" unstable > > until you close the feature. > Interesting, that's a differe

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

Right! for that reason I said the new planed cases was something never came to flex before because all work was mainly "additive". If you plan to make a new component...you can make it in develop, because it will not break nothing! since is new and nobody is using it. Now thing in change UICompon

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 3:45 PM, "Carlos Rovira" wrote: > Hi Alex, > > What is that "clarity"? Can you give me an example? If I want to >> contribute a set of Spark Charts, why should I have to cut a branch first? >> Why can't I just check in ChartBase into the "develop" branch, then add in >> Pie, Bar,

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Mon, Aug 13, 2012 at 3:29 PM, Alex Harui wrote: > > > > On 8/13/12 3:24 PM, "Carlos Rovira" wrote: > > > 2012/8/14 Dave Fisher > > > >> One thing I like about SVN is that it discourages branching to necessary > >> times while git encourages branching for a whim. > >> > > > > SVN discourages

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

Hi Alex, What is that "clarity"? Can you give me an example? If I want to > contribute a set of Spark Charts, why should I have to cut a branch first? > Why can't I just check in ChartBase into the "develop" branch, then add in > Pie, Bar, etc over time in subsequent check ins as I finish them u

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 3:15 PM, "Dave Fisher" wrote: > > On Aug 13, 2012, at 2:52 PM, Alex Harui wrote: > >> >> >>> >>> Really what is the worst that can happen if someone plays in trunk and makes >>> a >>> mistake? >>> >>> Regards, >>> Dave >>> >> For me, I don't like the psychology of reverting s

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On 8/13/12 3:24 PM, "Carlos Rovira" wrote: > 2012/8/14 Dave Fisher > >> One thing I like about SVN is that it discourages branching to necessary >> times while git encourages branching for a whim. >> > > SVN discourages branching because is not a core part in the design of the > system, wh

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

I propose we should try to continue discussion in the other thread and let this only for voting, or it could grow too much and be complicated to follow for people counting votes -- > Carlos Rovira > Director de Tecnología > M: +34 607 22 60 05 > F: +34 912 35 57 77 >

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

2012/8/14 Dave Fisher > One thing I like about SVN is that it discourages branching to necessary > times while git encourages branching for a whim. > SVN discourages branching because is not a core part in the design of the system, while in Git is a core part. In SVN you try to not branch becau

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

Fisher > To: "flex-dev@incubator.apache.org" > Sent: Mon, Aug 13, 2012 21:40:03 GMT+00:00 > Subject: [DISCUSS] Re: [VOTE] Branching Strategy and SCM > > > On Aug 13, 2012, at 1:43 PM, Omar Gonzalez wrote: > > > On Mon, Aug 13, 2012 at 1:39 PM, Dave Fisher >

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Aug 13, 2012, at 2:52 PM, Alex Harui wrote: > > >> >> Really what is the worst that can happen if someone plays in trunk and makes >> a >> mistake? >> >> Regards, >> Dave >> > For me, I don't like the psychology of reverting someone's changes, or even > my own. It feels like going backw

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

ce control not yet totally supported by > infra. I'd be ok with Git once that happens. > > Carol > > Sent from my Motorola ATRIX™ 4G on AT&T > > > -Original message- > From: Dave Fisher > To: "flex-dev@incubator.apache.org" > Sent:

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

orted by infra. I'd be ok with Git once that happens. Carol Sent from my Motorola ATRIX™ 4G on AT&T -Original message- From: Dave Fisher To: "flex-dev@incubator.apache.org" Sent: Mon, Aug 13, 2012 21:40:03 GMT+00:00 Subject: [DISCUSS] Re: [VOTE] Branching Strategy a

Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> > Really what is the worst that can happen if someone plays in trunk and makes a > mistake? > > Regards, > Dave > For me, I don't like the psychology of reverting someone's changes, or even my own. It feels like going backward. If the only public copy of some work goes in trunk and then ge

[DISCUSS] Re: [VOTE] Branching Strategy and SCM

On Aug 13, 2012, at 1:43 PM, Omar Gonzalez wrote: > On Mon, Aug 13, 2012 at 1:39 PM, Dave Fisher wrote: > >> My opinion/vote is (4) - no guts, no glory - work in trunk and learn to >> co-operate. >> >> The vote is more about the Classic model than it is about Git vs. SVN. >> >> To me svn tag