Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I have a commercial Android project that I have created a client-specific version for (mainly UI tweaks). Since the bulk of the tweaks are in the res/ folder in XML files, we have the changes currently in a branch but I really don't want to have to port changes back and forth between branches in perpetuity. I'm curious if anyone has any source control strategies that will make managing multiple client-specific versions of an Android application as painless as possible.

Also, not sure if this belongs here or StackOverflow. Feel free to transition over there if I guessed wrong.

share|improve this question
    
If you were using Mercurial, I'd suggest Mercurial Queues, so maybe stackoverflow.com/q/952651/42473 would be of some help. –  Mark Booth Jul 5 '11 at 16:07
    
Have you checked out submodules? That might help. –  Nic Aug 5 '11 at 22:56
add comment

2 Answers

Have you consider apply a style of programming called FeatureToggle?

The basic idea is to have a configuration file that defines a bunch of toggles for various features you have pending. The running application then uses these toggles in order to decide whether or not to show the new feature.

While is hard, we usually use this style when it´s hard to use branches.

More about this by Martin Fowler. http://martinfowler.com/bliki/FeatureToggle.html

share|improve this answer
add comment

The path we are going down is we are avoiding custom code as much as possible, and the app resources (everything in the res/ subdirectory) are stored in a separate git project with its own branches. That way we can decouple feature branches from UI branches and test features with different UI's without having to do the gymnastics from before where the UI was tied with the code on a per-branch basis, if that makes sense.

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.