Hi,

On 01-Aug-2014, at 1:59 am, Sheng Yang <sh...@yasker.org> wrote:

> Work need to be tested, but create one branch for every bug seems over
> doing. Branch in Git suppose to use with substantial changes. I don't think
> anyone would like the idea to have 2 commits for every bug fixes(one merge
> commit and one real fix). And it's not the case in the original model as
> well.

I understand what you’re saying but it’s not the only way to merge;

It’s good to start off in a bug’s own branch, there is no need to simply merge 
the branch to target/master/develop branch, instead you can do a squash merge 
(resulting in one commit and linear history) or cherry-pick as applicable.

> Patch can be tested by other ways, e.g. upload patches to test system, or
> introduce e.g. gerrit, which can integrated with Jenkins to run test on
> specific review commit, without commit it to the repo, which I really like
> to recommended to enforce the testing. Simply branching out wouldn't mean
> you would test it.

There is another thread on speeding up validations of your checkins - 
http://markmail.org/message/w2hqmrfpfrhsife6

For small fixes where developer is sure it does not affect the system (say a 
change in UI, string fixes, refactorings etc.) he may skip smoke tests but for 
his a lot of work he may run it often. Automated systems will eventually find 
the bug but it’s good idea to validate your changes before you push them to 
master/develop etc.

Regards.

>
> --Sheng

Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab




Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure 
Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>

This email and any attachments to it may be confidential and are intended 
solely for the use of the individual to whom it is addressed. Any views or 
opinions expressed are solely those of the author and do not necessarily 
represent those of Shape Blue Ltd or related companies. If you are not the 
intended recipient of this email, you must neither take any action based upon 
its contents, nor copy or show it to anyone. Please contact the sender if you 
believe you have received this email in error. Shape Blue Ltd is a company 
incorporated in England & Wales. ShapeBlue Services India LLP is a company 
incorporated in India and is operated under license from Shape Blue Ltd. Shape 
Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is 
operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company 
registered by The Republic of South Africa and is traded under license from 
Shape Blue Ltd. ShapeBlue is a registered trademark.

Reply via email to