From: Avery Pennarun <apenwarr@gmail.com>
To: Ivan Dimitrov <ivand58@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [git question] how to handle few projects with common parts?
Date: Fri, 23 Oct 2009 12:07:38 -0400 [thread overview]
Message-ID: <32541b130910230907x38d8c1f8vb504865eaf5b524@mail.gmail.com> (raw)
In-Reply-To: <368bc75e0910230201y8e4310dme6276d436c6a6ab6@mail.gmail.com>
On Fri, Oct 23, 2009 at 5:01 AM, Ivan Dimitrov <ivand58@gmail.com> wrote:
> Maybe my question relates rather to configuration management, but it
> is over GIT.
> In short - I have to manage two projects with 95% same files
> (components) and all the rest are platform depended. I am trying to
> keep different platforms in different branches, but I can't figure out
> how keep the common part of the project synchronized?
Are the other files (1) *completely* different across branches, or (2)
the same in each branch, but customized?
If (1), I don't think branches are the answer. You probably just want
a subdir per platform and a simple config file that points at which
branch to use. Or maybe use some #ifdefs, or whatever the equivalent
is in your system.
If (2), perhaps what you want is three branches: a main development
branch, and two customized branches that you merge (or rebase) master
into. I do this sometimes when I want a "development" branch and then
some specific customizations for a particular production deployment.
(eg. a default config file and the "live" config file, and I want both
to be version controlled separately)
Have fun,
Avery
prev parent reply other threads:[~2009-10-23 16:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-23 9:01 [git question] how to handle few projects with common parts? Ivan Dimitrov
2009-10-23 16:07 ` Avery Pennarun [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32541b130910230907x38d8c1f8vb504865eaf5b524@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=ivand58@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).