Geek Answers Handbook

Software with 2 versions: the best approach to VCS?

I suppose I better explain my situation:

I am developing some software, and I am at a stage where I would like to divide my project into two branches that differ in functions. It so happened that this application is an Android application that I will deploy in a market that has a limitation that each application must have a unique package identifier (reasonable, no?).

My current approach was to clone the git repository of my original project, but this causes package name problems. I want the system to be reliable enough so that the bugfix / new function in one branch merges into another branch, but only when I want it.

Does anyone have any suggestions?

+5
source share
3 answers

I myself deal with this specific case for a paid application and a trial version with the same code base. I use SVN, but any versioning software that supports branching will work.

I created a branch for the trial version from the torso.

Then I changed the test file AndroidManifest.xml to change the package name, adding .trial to the end. Then I also had to update all the java activity files to refer to the correct R class.

My paid application package is com.hewittsoft.baby
My trial application package is com.hewittsoft.baby.trial

In my actions on the trial branch, I do this

import com.hewittsoft.baby.trial.R;

and calls references to R.id.textField (or something else).

, , , .

+3

, ( ) Git.

, , , , ( ).
, , script, , , (jar) .

+3

More articles:


All Articles