Which is the best approach if you have multiple projects (sites) that are being developed and/or run on one box, with the projects both wanting to share a lot of changes/bugfixes to the original code, and, at the same time, wanting to run individual custom made code?
For example: At the moment I have two sites that run separate instances of OpenACS 4.5b. I imported the same codebase twice into two separate repositories.
This isn't very practical as I have to copy code from one dev checkout to the other, or deal with patching...
OTOH it is nice when I want to separate the code from the projects, and it's very simple.
But, probably 99 percent of the code is identical.
So, would it be workable to let several projects share one repository using branches or some such?
If so, can anyone briefly describe such a solution?