[TIMOB-2446] Android: don't overwrite build/android/.gitignore if it's already there
GitHub Issue | n/a |
---|---|
Type | Bug |
Priority | Trivial |
Status | Closed |
Resolution | Fixed |
Resolution Date | 2011-04-17T01:59:08.000+0000 |
Affected Version/s | n/a |
Fix Version/s | Release 1.5.0 M04 |
Components | Android |
Labels | android, defect |
Reporter | Bill Dawson |
Assignee | Bill Dawson |
Created | 2011-04-15T03:20:04.000+0000 |
Updated | 2011-04-17T01:59:08.000+0000 |
Description
Users may have their own preferences for what belongs in that .gitignore if they are using git.
cf android.py 256.
(from [c4d696646b56bab6fc6748fc4d0983124d08c162]) [#2446 state:fixed-in-qa] Don't overwrite .gitignore if it's already in build/android, in case developer-user wants to specify their own stuff in there. https://github.com/appcelerator/titanium_mobile/commit/c4d696646b56bab6fc6748fc4d0983124d08c162"> https://github.com/appcelerator/titanium_mobile/commit/c4d696646b56...
To test:
Create a new project and launch it in Android.
check the build/android folder and make sure there is our default .gitignore in there (to be sure I didn't break the actual creation of the .gitignore when it doesn't already exist.)
Edit that .gitignore and put something silly and memorable in it. Save it.
"touch" the tiapp.xml to force a full re-build on the next launch (it's the full rebuild that would previously replace the .gitignore.)
re-launch the app in Android.
go look at build/android/.gitignore again. Whatever you added should still be in there -- i.e., it shouldn't have gotten overwritten.
Pass
$ more .gitignore src
lib
bin
res
gen
marshall_lawProgramsWithoutWearingPants
AndroidManifest.xml