You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Erik de Bruin <er...@ixsoftware.nl> on 2013/03/29 09:15:48 UTC
[Git + Falcon] all projects in one basket?
Hi,
A question for the git gurus out there:
Currently all 5 Falcon projects (compiler, js, js and 2x tests) are
all in one repo. This means that on my system, all these repos will be
on the same branch. Now, if at some point in the future we want to
work on Jx in one branch (say a BugFix), but want to use the changes
made to the compiler on the 'develop' branch. How do we go about this?
Wouldn't it make more sense to have 5 different repos - or three, if
we include the tests with their respective projects? Or am I just
missing some magic sequence of checkout/pull/rebase that might be
used?
Thanks,
EdB
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [Git + Falcon] all projects in one basket?
Posted by Jose Barragan <jo...@codeoscopic.com>.
Just two ideas:
1- clone again in your hard disk to establish each current branch and related each together, just for your local usage
2- separate those subprojects as git submodules, by this way, you can establish any pointer at any submodule related from a single commit in master project.
-Jose
On Mar 29, 2013, at 10:39 AM, Frédéric THOMAS <we...@hotmail.com> wrote:
> True Justin, it's not my intention, maybe my misunderstanding of the projects living together, having apparently, from what I can understand things in common but not in the same development line ? it is where I'm lost maybe.
>
> If it is just to create a bugFix branch and get back the work (or a part) done on the develop branch time to time, it's like the flex-sdk git usage.
>
> -Fred
>
> -----Message d'origine----- From: Justin Mclean
> Sent: Friday, March 29, 2013 10:31 AM
> To: dev@flex.apache.org
> Subject: Re: [Git + Falcon] all projects in one basket?
>
> Hi,
>
>> That's not currently the case, so project1 can live on a branch, when you needs commits from another branch/project
> Please -1 to this. Just work in develop as was voted on. Why do we need to make things far more complex than they need to be?
>
> Justin
Re: [Git + Falcon] all projects in one basket?
Posted by Frédéric THOMAS <we...@hotmail.com>.
True Justin, it's not my intention, maybe my misunderstanding of the
projects living together, having apparently, from what I can understand
things in common but not in the same development line ? it is where I'm lost
maybe.
If it is just to create a bugFix branch and get back the work (or a part)
done on the develop branch time to time, it's like the flex-sdk git usage.
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Friday, March 29, 2013 10:31 AM
To: dev@flex.apache.org
Subject: Re: [Git + Falcon] all projects in one basket?
Hi,
> That's not currently the case, so project1 can live on a branch, when you
> needs commits from another branch/project
Please -1 to this. Just work in develop as was voted on. Why do we need to
make things far more complex than they need to be?
Justin
Re: [Git + Falcon] all projects in one basket?
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> That's not currently the case, so project1 can live on a branch, when you needs commits from another branch/project
Please -1 to this. Just work in develop as was voted on. Why do we need to make things far more complex than they need to be?
Justin
Re: [Git + Falcon] all projects in one basket?
Posted by Frédéric THOMAS <we...@hotmail.com>.
Well, I don't know the specifics of your projects, I mean how those projects
have things in common, so don't take my answer as 100% adapted for your
case.
Tell more specific case, maybe I can't be more specific as well.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Friday, March 29, 2013 9:29 AM
To: dev@flex.apache.org
Subject: Re: [Git + Falcon] all projects in one basket?
The normal git workflow imply you have 1 project per repo, unit tests
included, functional tests could stand in another one.
That's not currently the case, so project1 can live on a branch, when you
needs commits from another branch/project, depending of what you need, you
can do a 'git rebase origin <anotherbranch> to get all the work done onto
this remote branch into your working branch or 'git cherry-pick <HASH1>
<HASH2> <HASHx>' HASHx can be obtain if you first do a 'git pull --rebase'
from the <anotherbranch> and then a 'git hist' to get the HASHs of the
commits you need to introduce in your working branch (the 'git cherry-pick'
should be done from your branch/project).
-Fred
-----Message d'origine-----
From: Erik de Bruin
Sent: Friday, March 29, 2013 9:15 AM
To: dev@flex.apache.org
Subject: [Git + Falcon] all projects in one basket?
Hi,
A question for the git gurus out there:
Currently all 5 Falcon projects (compiler, js, js and 2x tests) are
all in one repo. This means that on my system, all these repos will be
on the same branch. Now, if at some point in the future we want to
work on Jx in one branch (say a BugFix), but want to use the changes
made to the compiler on the 'develop' branch. How do we go about this?
Wouldn't it make more sense to have 5 different repos - or three, if
we include the tests with their respective projects? Or am I just
missing some magic sequence of checkout/pull/rebase that might be
used?
Thanks,
EdB
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [Git + Falcon] all projects in one basket?
Posted by Frédéric THOMAS <we...@hotmail.com>.
The normal git workflow imply you have 1 project per repo, unit tests
included, functional tests could stand in another one.
That's not currently the case, so project1 can live on a branch, when you
needs commits from another branch/project, depending of what you need, you
can do a 'git rebase origin <anotherbranch> to get all the work done onto
this remote branch into your working branch or 'git cherry-pick <HASH1>
<HASH2> <HASHx>' HASHx can be obtain if you first do a 'git pull --rebase'
from the <anotherbranch> and then a 'git hist' to get the HASHs of the
commits you need to introduce in your working branch (the 'git cherry-pick'
should be done from your branch/project).
-Fred
-----Message d'origine-----
From: Erik de Bruin
Sent: Friday, March 29, 2013 9:15 AM
To: dev@flex.apache.org
Subject: [Git + Falcon] all projects in one basket?
Hi,
A question for the git gurus out there:
Currently all 5 Falcon projects (compiler, js, js and 2x tests) are
all in one repo. This means that on my system, all these repos will be
on the same branch. Now, if at some point in the future we want to
work on Jx in one branch (say a BugFix), but want to use the changes
made to the compiler on the 'develop' branch. How do we go about this?
Wouldn't it make more sense to have 5 different repos - or three, if
we include the tests with their respective projects? Or am I just
missing some magic sequence of checkout/pull/rebase that might be
used?
Thanks,
EdB
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl