On 21/03/2012 17:44, Jean-Marc Lasgouttes wrote:
Le 21/03/2012 16:14, Vincent van Ravesteijn a écrit :
There is also a 2.0.x branch in your first clone, so you can just
cherry-pick the commit to master directly onto this 2.0.x branch, and
push from there.
But If I want to compile both the master and the branch without doing
a full rebuild everytime, I have to have two checkouts living in
different places, right?
No. You just need two build directories. At least with cmake... With
autoconf, you still need to run autogen.sh in source directory, which is
quite bad.
With cmake, your source directory will stay as virgin of any generated
file as ever :-)
Best is to put your 2 build dirs out of the git repo. But if you put
them in there you can still add them to top-level ".gitignore".
Cheers,
Abdel.