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
