Yes, I did a pull of the develop branch to get current. Sent from my iPad
On Apr 2, 2013, at 9:30 PM, "Alex Harui" <aha...@adobe.com> wrote: > "not stages" is like SVN saying a file is modified. > > "untracked" is like SVN saying a file is unversioned (not added to SVN). > > I'd be curious as to what did change in flex-config and Version.java. I > thought Fred cleaned up the rest. Did you do a git pull to get synced up > (like svn update). > > > > On 4/2/13 9:24 PM, "Gordon Smith" <gosm...@adobe.com> wrote: > >> After I build flex-sdk with 'ant clean main checkintests', 'git status' shows >> a bunch of changes to my working tree that aren't relevant. I think this >> means >> we need to add more entries to .gitignore, but I don't understand why some >> files show up as "Changes not staged for commit" and others as "Untracked >> files". Can somebody who understands Git better explain this? >> >> - Gordon >> >> $ git status >> # On branch develop >> # Changes not staged for commit: >> # (use "git add <file>..." to update what will be committed) >> # (use "git checkout -- <file>..." to discard changes in working directory) >> # >> # modified: frameworks/flex-config.xml >> # modified: modules/asc/src/java/macromedia/asc/util/Version.java >> # >> # Untracked files: >> # (use "git add <file>..." to include in what will be committed) >> # >> # flex-sdk-description.xml >> # frameworks/projects/advancedgrids/bundles.properties >> # frameworks/projects/airframework/bundles.properties >> # frameworks/projects/airspark/bundles.properties >> # frameworks/projects/apache/bundles.properties >> # frameworks/projects/authoringsupport/bundles.properties >> # frameworks/projects/automation/bundles.properties >> # frameworks/projects/automation_agent/bundles.properties >> # frameworks/projects/automation_air/bundles.properties >> # frameworks/projects/automation_airspark/bundles.properties >> # frameworks/projects/charts/bundles.properties >> # frameworks/projects/core/bundles.properties >> # frameworks/projects/experimental/bundles.properties >> # frameworks/projects/flash-integration/bundles.properties >> # frameworks/projects/framework/bundles.properties >> # frameworks/projects/halo/bundles.properties >> # frameworks/projects/mobilecomponents/bundles.properties >> # frameworks/projects/mobiletheme/bundles.properties >> # frameworks/projects/mx/bundles.properties >> # frameworks/projects/rpc/bundles.properties >> # frameworks/projects/spark/bundles.properties >> # frameworks/projects/spark/manifest.xml >> # frameworks/projects/spark_dmv/bundles.properties >> # frameworks/projects/sparkskins/bundles.properties >> # frameworks/projects/tool_air/bundles.properties >> # frameworks/projects/wireframe/bundles.properties >> no changes added to commit (use "git add" and/or "git commit -a") > > -- > Alex Harui > Flex SDK Team > Adobe Systems, Inc. > http://blogs.adobe.com/aharui >
