You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Gordon Smith <go...@adobe.com> on 2013/04/03 06:24:09 UTC
How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
> Are you saying that if Git says my repo says it is up to date it isn't
> necessarily up to date?
No, I never seen that before.
> I'm not comfortable which making any changes to this file. I didn't
> configure it in the first place as far as I know. Where did it come from?
For the .gitconfig, you should, for the <flex-sdk>/.git/config that's mine
and it works, that's the reason why I suggested you to try otherwise, you
can always clone it again.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 9:50 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that if Git says my repo says it is up to date it isn't
necessarily up to date?
I'm not comfortable which making any changes to this file. I didn't
configure it in the first place as far as I know. Where did it come from?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:47 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I can't see anything special but I suggest you to replace its content by [1]
and in more what there's in the wiki relative to the .config, to add
excludesfile = .gitignore to the core section, I'll update the wiki later.
-Fred
[1]
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
hideDotFiles = dotGitOnly
[remote "origin"]
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
[branch]
autosetuprebase = always
[branch "develop"]
remote = origin
merge = refs/heads/develop
rebase = true
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:32 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ cat .git/config [core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "develop"]
remote = origin
merge = refs/heads/develop
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:09 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Humm, no idea, could you show me your <flex-sdk>/.git/config ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:01 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
If my repo is not up to date, why does doing "git pull" while I'm on the
develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git
reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git
status' is a result of also building flex-falcon with 'ant clean all' after
building flex-sdk with 'ant clean main checkintests'. For example, Falcon
tests recompile a bunch of SWCs and may be producing the bundles.properties
files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the
repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Are you saying that if Git says my repo says it is up to date it isn't necessarily up to date?
I'm not comfortable which making any changes to this file. I didn't configure it in the first place as far as I know. Where did it come from?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:47 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I can't see anything special but I suggest you to replace its content by [1] and in more what there's in the wiki relative to the .config, to add excludesfile = .gitignore to the core section, I'll update the wiki later.
-Fred
[1]
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
hideDotFiles = dotGitOnly
[remote "origin"]
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
[branch]
autosetuprebase = always
[branch "develop"]
remote = origin
merge = refs/heads/develop
rebase = true
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:32 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ cat .git/config [core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "develop"]
remote = origin
merge = refs/heads/develop
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:09 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Humm, no idea, could you show me your <flex-sdk>/.git/config ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:01 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
If my repo is not up to date, why does doing "git pull" while I'm on the develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git status' is a result of also building flex-falcon with 'ant clean all' after building flex-sdk with 'ant clean main checkintests'. For example, Falcon tests recompile a bunch of SWCs and may be producing the bundles.properties files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
I can't see anything special but I suggest you to replace its content by [1]
and in more what there's in the wiki relative to the .config, to add
excludesfile = .gitignore to the core section, I'll update the wiki later.
-Fred
[1]
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
hideDotFiles = dotGitOnly
[remote "origin"]
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
[branch]
autosetuprebase = always
[branch "develop"]
remote = origin
merge = refs/heads/develop
rebase = true
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:32 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "develop"]
remote = origin
merge = refs/heads/develop
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:09 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Humm, no idea, could you show me your <flex-sdk>/.git/config ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:01 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
If my repo is not up to date, why does doing "git pull" while I'm on the
develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git
reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git
status' is a result of also building flex-falcon with 'ant clean all' after
building flex-sdk with 'ant clean main checkintests'. For example, Falcon
tests recompile a bunch of SWCs and may be producing the bundles.properties
files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the
repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = https://git-wip-us.apache.org/repos/asf/flex-sdk.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "develop"]
remote = origin
merge = refs/heads/develop
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 11:09 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Humm, no idea, could you show me your <flex-sdk>/.git/config ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:01 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
If my repo is not up to date, why does doing "git pull" while I'm on the develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git status' is a result of also building flex-falcon with 'ant clean all' after building flex-sdk with 'ant clean main checkintests'. For example, Falcon tests recompile a bunch of SWCs and may be producing the bundles.properties files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Humm, no idea, could you show me your <flex-sdk>/.git/config ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 8:01 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
If my repo is not up to date, why does doing "git pull" while I'm on the
develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git
reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git
status' is a result of also building flex-falcon with 'ant clean all' after
building flex-sdk with 'ant clean main checkintests'. For example, Falcon
tests recompile a bunch of SWCs and may be producing the bundles.properties
files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the
repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
If my repo is not up to date, why does doing "git pull" while I'm on the develop branch produce the output "Already up to date"?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git status' is a result of also building flex-falcon with 'ant clean all' after building flex-sdk with 'ant clean main checkintests'. For example, Falcon tests recompile a bunch of SWCs and may be producing the bundles.properties files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Sorry, you right, I thought I had already merged my branch where the
.gitignore is updated.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:37 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> Your repo is not up to date as I can see from your .gitignore
Why do you think it is not up to date? My .gitignore seems to be like the
current .gitignore in flex-sdk's develop branch, as seen at
https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=blob;f=.gitignore;h=0c84fc394c4ab4a92795a54ed61d97ac09fdb4eb;hb=develop
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git
reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git
status' is a result of also building flex-falcon with 'ant clean all' after
building flex-sdk with 'ant clean main checkintests'. For example, Falcon
tests recompile a bunch of SWCs and may be producing the bundles.properties
files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the
repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
> Your repo is not up to date as I can see from your .gitignore
Why do you think it is not up to date? My .gitignore seems to be like the current .gitignore in flex-sdk's develop branch, as seen at
https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=blob;f=.gitignore;h=0c84fc394c4ab4a92795a54ed61d97ac09fdb4eb;hb=develop
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 10:51 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git status' is a result of also building flex-falcon with 'ant clean all' after building flex-sdk with 'ant clean main checkintests'. For example, Falcon tests recompile a bunch of SWCs and may be producing the bundles.properties files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Gordon,
Check
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
for your .gitconfig
Your repo is not up to date as I can see from your .gitignore, do a git
reset --hard HEAD followed by a git pull --rebase and then rebuild the sdk.
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 7:12 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
When I have time, I'll investigate whether the unexpected output from 'git
status' is a result of also building flex-falcon with 'ant clean all' after
building flex-sdk with 'ant clean main checkintests'. For example, Falcon
tests recompile a bunch of SWCs and may be producing the bundles.properties
files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the
repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
When I have time, I'll investigate whether the unexpected output from 'git status' is a result of also building flex-falcon with 'ant clean all' after building flex-sdk with 'ant clean main checkintests'. For example, Falcon tests recompile a bunch of SWCs and may be producing the bundles.properties files. But I think the old compiler produces them also.
Here is my .gitconfi:
$ cat ~/.gitconfig
[user]
name = Gordon Smith
email = gosmith@adobe.com
[core]
autocrlf = input
I haven't touched the .gitignore for flex-sdk so it should be what is in the repo. (See below.)
$ cat .gitignore
# eclipse conf file
.settings
.classpath
.project
.manager
.scala_dependencies
.cache
# idea conf files
.idea
*.iml
*.ipr
*.iws
# building
target
[Bb]uild/
null
tmp
temp
dist
test-output
build.log
release
out
gen
#Apache Flex Projects
lib/
libs/
in/
swfobject/
ide/
flex2/
thirdparty/
META-INF/
3.0.33/
3.0.33
*.pbj
*.vms
*.ser
*.mxp
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
env.properties
local.properties
#OS junk files
[Tt]humbs.db
*.DS_Store
#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
#CVS files
.svn
.git
# Office Temp Files
~$*
#Binaries
*.dll
*.bin
*.com
*.exe
*.class
*.jar
*.swf
*.swc
#Compressed Files
*.zip
*.rar
*.tar
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 1:27 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
And your <flex-sdk>/.gitignore too ?
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Wednesday, April 03, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Gordon,
It looks like your repo is not updated or your config is messy.
Can you show up your <HOME>/.gitconfig please ?
Thanks,
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 6:24 AM
To: dev@flex.apache.org
Subject: How to get a clean working tree for flex-sdk
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")
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Cleaning up after building in a Git repo shouldn't be any different than cleaning up after building in a SVN repo. You do 'ant clean' and if it doesn't remove everything you fix the 'clean' target.
- Gordon
-----Original Message-----
From: Harbs [mailto:harbs.lists@gmail.com]
Sent: Wednesday, April 03, 2013 4:32 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Amen to that... ;-)
On Apr 4, 2013, at 2:26 AM, Mark Kessler wrote:
> After reading this, I think I'll stay with my syncing the Flex-SDK to
> a separate folder when I want to build it. Sounds like cleaning up
> files after building in your git repo is a PITA.
>
> -Mark
Re: How to get a clean working tree for flex-sdk
Posted by Harbs <ha...@gmail.com>.
Amen to that… ;-)
On Apr 4, 2013, at 2:26 AM, Mark Kessler wrote:
> After reading this, I think I'll stay with my syncing the Flex-SDK to a
> separate folder when I want to build it. Sounds like cleaning up files
> after building in your git repo is a PITA.
>
> -Mark
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
+1, in more, I'm doing a wiki to have a good working git configuration and I
have a branch that once merged will solve other issues.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:30 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Well, we're not discussing whether 'ant clean' fully removes all build
output. I hope it does, but I'm not sure how to tell any more. (Probably
somehow running 'git status' without a .gitnore would do it.)
We're discussing the fact that we generally want 'git status' to not show
build output but only editing changes.
- Gordon
-----Original Message-----
From: Mark Kessler [mailto:kesslerconsulting@gmail.com]
Sent: Wednesday, April 03, 2013 4:27 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
After reading this, I think I'll stay with my syncing the Flex-SDK to a
separate folder when I want to build it. Sounds like cleaning up files
after building in your git repo is a PITA.
-Mark
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Well, we're not discussing whether 'ant clean' fully removes all build output. I hope it does, but I'm not sure how to tell any more. (Probably somehow running 'git status' without a .gitnore would do it.)
We're discussing the fact that we generally want 'git status' to not show build output but only editing changes.
- Gordon
-----Original Message-----
From: Mark Kessler [mailto:kesslerconsulting@gmail.com]
Sent: Wednesday, April 03, 2013 4:27 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
After reading this, I think I'll stay with my syncing the Flex-SDK to a separate folder when I want to build it. Sounds like cleaning up files after building in your git repo is a PITA.
-Mark
Re: How to get a clean working tree for flex-sdk
Posted by Mark Kessler <ke...@gmail.com>.
After reading this, I think I'll stay with my syncing the Flex-SDK to a
separate folder when I want to build it. Sounds like cleaning up files
after building in your git repo is a PITA.
-Mark
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
AFAIK, yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:21 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style
property set, like many other files.
When you check out a Git branch, can some files get a different mode than
others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the
build, maybe we should find how they were in Svn, it might have happened
that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be
changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files.
When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Ah ok, well, I guess that could be the reason too.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:38 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I do Ant and Git in Cygwin on Windows. Maybe that makes a difference.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
The weird thing is it didn't happened to me :P
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:32 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
So it sounds like the build scripts have somehow made these files
"executable", which makes no sense for .java and .xml files. I'd prefer that
we fix that rather than ignore mode diffs.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:29 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I just read the git mode particularities from [1]
In this case, you’re specifying a mode of 100644, which means it’s a normal
file. Other options are 100755, which means it’s an executable file; and
120000, which specifies a symbolic link. The mode is taken from normal UNIX
modes but is much less flexible — these three modes are the only ones that
are valid for files (blobs) in Git (although other modes are used for
directories and submodules).
-Fred
[1] http://git-scm.com/book/en/Git-Internals-Git-Objects
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:26 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
The Ant scripts are rewriting these files to inject version numbers. (Ugh!)
So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to
set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style
property set, like many other files.
When you check out a Git branch, can some files get a different mode than
others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the
build, maybe we should find how they were in Svn, it might have happened
that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be
changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I do Ant and Git in Cygwin on Windows. Maybe that makes a difference.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
The weird thing is it didn't happened to me :P
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:32 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
So it sounds like the build scripts have somehow made these files "executable", which makes no sense for .java and .xml files. I'd prefer that we fix that rather than ignore mode diffs.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:29 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I just read the git mode particularities from [1]
In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible — these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
-Fred
[1] http://git-scm.com/book/en/Git-Internals-Git-Objects
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:26 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
The Ant scripts are rewriting these files to inject version numbers. (Ugh!) So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files.
When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
The weird thing is it didn't happened to me :P
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:32 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
So it sounds like the build scripts have somehow made these files
"executable", which makes no sense for .java and .xml files. I'd prefer that
we fix that rather than ignore mode diffs.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:29 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I just read the git mode particularities from [1]
In this case, you’re specifying a mode of 100644, which means it’s a normal
file. Other options are 100755, which means it’s an executable file; and
120000, which specifies a symbolic link. The mode is taken from normal UNIX
modes but is much less flexible — these three modes are the only ones that
are valid for files (blobs) in Git (although other modes are used for
directories and submodules).
-Fred
[1] http://git-scm.com/book/en/Git-Internals-Git-Objects
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:26 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
The Ant scripts are rewriting these files to inject version numbers. (Ugh!)
So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to
set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style
property set, like many other files.
When you check out a Git branch, can some files get a different mode than
others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the
build, maybe we should find how they were in Svn, it might have happened
that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be
changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
So it sounds like the build scripts have somehow made these files "executable", which makes no sense for .java and .xml files. I'd prefer that we fix that rather than ignore mode diffs.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:29 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
I just read the git mode particularities from [1]
In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible — these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
-Fred
[1] http://git-scm.com/book/en/Git-Internals-Git-Objects
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:26 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
The Ant scripts are rewriting these files to inject version numbers. (Ugh!) So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files.
When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Hi Gordon,
There's a problem with the doc target in the experimental lib and because I
never dug into before I asked here if someone could have a look but
apparently no one did it so, I guess I'll have to do it, this bug was one
the tasks I wanted fix before to merge my branch, btw, this branch is
remote, you can check it out, see the thread called "asdoc - Release build
broken (was: Release build broken)", the JIRA is
https://issues.apache.org/jira/browse/FLEX-33451 and the remote branch
FLEX-33451
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Friday, April 05, 2013 2:28 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Fred, were you going to make changes to .gitignore?
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 5:24 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
OK, I've cleaned up the bad file modes in flex_tlf. There don't seem to be
any in flex-falcon or flex-asjs.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:31 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I've pushed the file mode fixes to flex-sdk.
'ant clean main checkintests' works for me in Cygwin on Windows. Please let
me know if I screwed anything up on Macs.
I'll clean up the bad file modes in flex-tlf tonight.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:14 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> After you're done, will a simple pull correct the local repo's?
I'm not a Git expert, but I'm pretty sure that it will. However, the fact
that many files were marked as "executable" (+x) when they shouldn't be is
not causing any problems that I know of. Fixing this is just housecleaning.
- Gordon
-----Original Message-----
From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
Sent: Thursday, April 04, 2013 10:25 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
Re: How to get a clean working tree for flex-sdk
Posted by Terry Corbet <te...@gmail.com>.
I probably do not understand enough of the problem you are describing, and
probably don't have enough smarts to provide anything of value, but, for
what it is worth:
A. The cygwin version of the 'cp' utility has a '-p' option which, in my
experience, keeps its promise; the target file will have precisely the same
mode, ownership and timestamp as the source file did.
B. Assuming that your ant tasks are just a convenient means for scripting
*nix commands, it would seem that you ought to be able to get ant to use
the 'cp -p'' syntax to accomplish anything that is merely a copy operation.
C. If, on the other hand, what is being accomplished is not a simple copy,
rather it is an update -- to roll a revision number, perform macro
replacement or the like -- the output is different from the input, so if
the process reports that as a change, it does so correctly.
D. If it is necessary and desired that a modified target be able to
masquerade as if it were the source, follow the copy operation with chmod
using the -reference option where the referent will point to the source.
On Tue, Apr 9, 2013 at 8:18 PM, Gordon Smith <go...@adobe.com> wrote:
> Background: I'm trying to get 'git status' to report nothing after simply
> doing a build of the SDK (which is what you expect because you haven't
> changed any source files). The problem is that a <copy> of flex-config.xml
> and a <replace> of Version.java in our Ant scripts seem to misbehave on
> Cygwin and have the side effect of doing "chmod +x" on these two files.
> This mode change then makes them show up as changed in 'git status'. Using
> Ant's <chmod> task to set -x doesn't seem to work.
>
> I don't think Alex's save-a-copy approach will work, because it use
> <copy>, which is causing the problem in the first place. I looked into his
> suggestion of doing a git checkout of the problematic files to put them
> back into their original states. This solves the problem.
>
> But is it OK for the Ant scripts to assume that a command-line git is
> installed? Some people might only have a Git GUI. And if so, is it OK for
> them to assume that git is on the path, or should GIT be another
> environment variable that you have to set?
>
> If we can't use Git, I think I would need to replace the <copy> and
> <replace> tasks with an <exec> that executes a small Java program (which we
> would have to compile from source).
>
> Is anybody else doing Apache Flex development using Cygwin?
>
> - Gordon
>
> -----Original Message-----
> From: Alex Harui [mailto:aharui@adobe.com]
> Sent: Thursday, April 04, 2013 10:44 PM
> To: dev@flex.apache.org
> Subject: Re: How to get a clean working tree for flex-sdk
>
> Can we get the build to save a copy of these files before modification and
> then replace them at the end of a build even if the build fails? Or maybe
> just add git checkout to the build script?
>
>
> On 4/4/13 9:28 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
> > After adding 3 entries to .gitignore to suppress some build output
> > files from showing up in 'git status', I'm now at the point where 'git
> > status' after a build shows only this:
> >
> > gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ 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
> > #
> > no changes added to commit (use "git add" and/or "git commit -a")
> >
> > Git is detecting that the SDK's Ant build scripts change the file mode
> > of flex-config.xml (which gets diddled with an Ant <copy>) and
> > Version.java (diddled with an Ant <replace>). These tasks seem to have
> > the side effect of doing chmod +x for some reason. I've tried using
> > <chmod file="..." perm="-x"> to fix this, but it doesn't seem to work.
> > Both of these issues are probably some unfortunate interaction between
> > Ant and Cygwin, but googling does't confirm this.(It does confirm that
> > the people who wrote Ant don't think much of Cygwin.
> >
> > If anybody has an idea of how to fix this, so that we get clean 'git
> status'
> > output after a build -- other than configurating Git to ignore file
> > modes -- let me know.
> >
> > I suppose one solution is to just use Command Prompt instead of
> > Cygwin, but then I have to give up other stuff. And another is to use
> > a Mac, which is what most people seem to be doing these days.
> >
> > - Gordon
> >
> >
> > -----Original Message-----
> > From: Alex Harui [mailto:aharui@adobe.com]
> > Sent: Thursday, April 04, 2013 8:46 PM
> > To: dev@flex.apache.org
> > Subject: Re: How to get a clean working tree for flex-sdk
> >
> > Awesome! Thanks.
> >
> >
> > On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
> >
> >> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
> >> to be any in flex-falcon or flex-asjs.
> >>
> >> - Gordon
> >>
> >> -----Original Message-----
> >> From: Gordon Smith [mailto:gosmith@adobe.com]
> >> Sent: Thursday, April 04, 2013 1:31 PM
> >> To: dev@flex.apache.org
> >> Subject: RE: How to get a clean working tree for flex-sdk
> >>
> >> I've pushed the file mode fixes to flex-sdk.
> >>
> >> 'ant clean main checkintests' works for me in Cygwin on Windows.
> >> Please let me know if I screwed anything up on Macs.
> >>
> >> I'll clean up the bad file modes in flex-tlf tonight.
> >>
> >> - Gordon
> >>
> >>
> >> -----Original Message-----
> >> From: Gordon Smith [mailto:gosmith@adobe.com]
> >> Sent: Thursday, April 04, 2013 1:14 PM
> >> To: dev@flex.apache.org
> >> Subject: RE: How to get a clean working tree for flex-sdk
> >>
> >>> After you're done, will a simple pull correct the local repo's?
> >>
> >> I'm not a Git expert, but I'm pretty sure that it will. However, the
> >> fact that many files were marked as "executable" (+x) when they
> >> shouldn't be is not causing any problems that I know of. Fixing this
> >> is just housecleaning.
> >>
> >> - Gordon
> >>
> >> -----Original Message-----
> >> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
> >> Sent: Thursday, April 04, 2013 10:25 AM
> >> To: dev@flex.apache.org
> >> Subject: RE: How to get a clean working tree for flex-sdk
> >>
> >> After you're done, will a simple pull correct the local repo's?
> >>
> >> -Mark
> >>
> >> -----Original Message-----
> >> From: Gordon Smith [mailto:gosmith@adobe.com]
> >> Sent: Thursday, April 04, 2013 1:18 PM
> >> To: dev@flex.apache.org
> >> Subject: RE: How to get a clean working tree for flex-sdk
> >>
> >> I'll work on fixing the bad file modes in the Git repos.
> >>
> >> - Gordon
> >
> > --
> > Alex Harui
> > Flex SDK Team
> > Adobe Systems, Inc.
> > http://blogs.adobe.com/aharui
> >
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
>
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
The .mxi is a source file so it shouldn't be in gitignore. The Extension
Manager changes its permissions to executable for unknown reason. I thought
I checked in an .mxi file with executable permissions to try to cure this
problem. Maybe I put it in the wrong branch or maybe it didn't work on
Windows.
On 4/9/13 8:34 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
> Hi,
>
> JFYI I'm running into a similar issue in windows in OSX. FlexComponentKit.mxi
> seems to have differing permissions but not sure if it should be added to
> .gitignore or not.
>
> You may also need to modify build.properties depending on your setup (eg TLF
> path) - how do we deal with that?
>
> Thanks,
> Justin
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: How to get a clean working tree for flex-sdk
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
JFYI I'm running into a similar issue in windows in OSX. FlexComponentKit.mxi seems to have differing permissions but not sure if it should be added to .gitignore or not.
You may also need to modify build.properties depending on your setup (eg TLF path) - how do we deal with that?
Thanks,
Justin
Re: How to get a clean working tree for flex-sdk
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> The Adobe Extension Manager for Windows can be downloaded from:
> http://download.macromedia.com/pub/dw_exchange/extension_manager/win/AdobeExtensionManager5All.zip
>
> On Windows, set ADOBE_EXTENSION_MANAGER to the absolute path of "Adobe Extension Manager CS5.exe"
I think you need to run the set-up.exe in that zip.
Justin
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I can't run that target because I don't understand how to set ADOBE_EXTENSION_MANAGER. These instructions from the README are incorrect:
The Adobe Extension Manager for Windows can be downloaded from:
http://download.macromedia.com/pub/dw_exchange/extension_manager/win/AdobeExtensionManager5All.zip
On Windows, set ADOBE_EXTENSION_MANAGER to the absolute path of "Adobe Extension Manager CS5.exe"
There is no file named "Adobe Extension Manager CS5.exe" inside AdobeExtensionManager5All.zip.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Friday, April 12, 2013 11:09 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Hi,
> After you do 'ant clean main checkintests' in flex-sdk, 'git status' now says
>
> nothing to commit (working directory clean)
And what does "ant release" give?
Thanks,
Justin
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
> And what does "ant release" give?
After I do 'ant release', 'git status' says
nothing to commit (working directory clean)
as expected.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Friday, April 12, 2013 11:09 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Hi,
> After you do 'ant clean main checkintests' in flex-sdk, 'git status' now says
>
> nothing to commit (working directory clean)
And what does "ant release" give?
Thanks,
Justin
Re: How to get a clean working tree for flex-sdk
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> After you do 'ant clean main checkintests' in flex-sdk, 'git status' now says
>
> nothing to commit (working directory clean)
And what does "ant release" give?
Thanks,
Justin
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
After you do 'ant clean main checkintests' in flex-sdk, 'git status' now says
nothing to commit (working directory clean)
as one would expect.
I dealt with the bogus mode change of Version.java that I was seeing on Cygwin by no longer rewriting Version.java to inject a build number. Instead asc gets its build number in the same way that mxmlc, compc, and fdb do, namely from a version.properties file which gets written out at build time with the build.number in it.
I dealt with the bogus mode change of flex-config.xml by removing flex-config.xml from the repository. It didn't belong there because it gets built from flex-config-template.xml.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Tuesday, April 09, 2013 8:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Background: I'm trying to get 'git status' to report nothing after simply doing a build of the SDK (which is what you expect because you haven't changed any source files). The problem is that a <copy> of flex-config.xml and a <replace> of Version.java in our Ant scripts seem to misbehave on Cygwin and have the side effect of doing "chmod +x" on these two files. This mode change then makes them show up as changed in 'git status'. Using Ant's <chmod> task to set -x doesn't seem to work.
I don't think Alex's save-a-copy approach will work, because it use <copy>, which is causing the problem in the first place. I looked into his suggestion of doing a git checkout of the problematic files to put them back into their original states. This solves the problem.
But is it OK for the Ant scripts to assume that a command-line git is installed? Some people might only have a Git GUI. And if so, is it OK for them to assume that git is on the path, or should GIT be another environment variable that you have to set?
If we can't use Git, I think I would need to replace the <copy> and <replace> tasks with an <exec> that executes a small Java program (which we would have to compile from source).
Is anybody else doing Apache Flex development using Cygwin?
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Thursday, April 04, 2013 10:44 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Can we get the build to save a copy of these files before modification and then replace them at the end of a build even if the build fails? Or maybe just add git checkout to the build script?
On 4/4/13 9:28 PM, "Gordon Smith" <go...@adobe.com> wrote:
> After adding 3 entries to .gitignore to suppress some build output
> files from showing up in 'git status', I'm now at the point where 'git
> status' after a build shows only this:
>
> gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ 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
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> Git is detecting that the SDK's Ant build scripts change the file mode
> of flex-config.xml (which gets diddled with an Ant <copy>) and
> Version.java (diddled with an Ant <replace>). These tasks seem to have
> the side effect of doing chmod +x for some reason. I've tried using
> <chmod file="..." perm="-x"> to fix this, but it doesn't seem to work.
> Both of these issues are probably some unfortunate interaction between
> Ant and Cygwin, but googling does't confirm this.(It does confirm that
> the people who wrote Ant don't think much of Cygwin.
>
> If anybody has an idea of how to fix this, so that we get clean 'git status'
> output after a build -- other than configurating Git to ignore file
> modes -- let me know.
>
> I suppose one solution is to just use Command Prompt instead of
> Cygwin, but then I have to give up other stuff. And another is to use
> a Mac, which is what most people seem to be doing these days.
>
> - Gordon
>
>
> -----Original Message-----
> From: Alex Harui [mailto:aharui@adobe.com]
> Sent: Thursday, April 04, 2013 8:46 PM
> To: dev@flex.apache.org
> Subject: Re: How to get a clean working tree for flex-sdk
>
> Awesome! Thanks.
>
>
> On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
>> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
>> to be any in flex-falcon or flex-asjs.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:31 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I've pushed the file mode fixes to flex-sdk.
>>
>> 'ant clean main checkintests' works for me in Cygwin on Windows.
>> Please let me know if I screwed anything up on Macs.
>>
>> I'll clean up the bad file modes in flex-tlf tonight.
>>
>> - Gordon
>>
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:14 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>>> After you're done, will a simple pull correct the local repo's?
>>
>> I'm not a Git expert, but I'm pretty sure that it will. However, the
>> fact that many files were marked as "executable" (+x) when they
>> shouldn't be is not causing any problems that I know of. Fixing this
>> is just housecleaning.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
>> Sent: Thursday, April 04, 2013 10:25 AM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> After you're done, will a simple pull correct the local repo's?
>>
>> -Mark
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:18 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I'll work on fixing the bad file modes in the Git repos.
>>
>> - Gordon
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
Gordon, does rename have the same issue?
On 4/9/13 8:18 PM, "Gordon Smith" <go...@adobe.com> wrote:
> Background: I'm trying to get 'git status' to report nothing after simply
> doing a build of the SDK (which is what you expect because you haven't changed
> any source files). The problem is that a <copy> of flex-config.xml and a
> <replace> of Version.java in our Ant scripts seem to misbehave on Cygwin and
> have the side effect of doing "chmod +x" on these two files. This mode change
> then makes them show up as changed in 'git status'. Using Ant's <chmod> task
> to set -x doesn't seem to work.
>
> I don't think Alex's save-a-copy approach will work, because it use <copy>,
> which is causing the problem in the first place. I looked into his suggestion
> of doing a git checkout of the problematic files to put them back into their
> original states. This solves the problem.
>
> But is it OK for the Ant scripts to assume that a command-line git is
> installed? Some people might only have a Git GUI. And if so, is it OK for them
> to assume that git is on the path, or should GIT be another environment
> variable that you have to set?
>
> If we can't use Git, I think I would need to replace the <copy> and <replace>
> tasks with an <exec> that executes a small Java program (which we would have
> to compile from source).
>
> Is anybody else doing Apache Flex development using Cygwin?
>
> - Gordon
>
> -----Original Message-----
> From: Alex Harui [mailto:aharui@adobe.com]
> Sent: Thursday, April 04, 2013 10:44 PM
> To: dev@flex.apache.org
> Subject: Re: How to get a clean working tree for flex-sdk
>
> Can we get the build to save a copy of these files before modification and
> then replace them at the end of a build even if the build fails? Or maybe
> just add git checkout to the build script?
>
>
> On 4/4/13 9:28 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
>> After adding 3 entries to .gitignore to suppress some build output
>> files from showing up in 'git status', I'm now at the point where 'git
>> status' after a build shows only this:
>>
>> gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ 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
>> #
>> no changes added to commit (use "git add" and/or "git commit -a")
>>
>> Git is detecting that the SDK's Ant build scripts change the file mode
>> of flex-config.xml (which gets diddled with an Ant <copy>) and
>> Version.java (diddled with an Ant <replace>). These tasks seem to have
>> the side effect of doing chmod +x for some reason. I've tried using
>> <chmod file="..." perm="-x"> to fix this, but it doesn't seem to work.
>> Both of these issues are probably some unfortunate interaction between
>> Ant and Cygwin, but googling does't confirm this.(It does confirm that
>> the people who wrote Ant don't think much of Cygwin.
>>
>> If anybody has an idea of how to fix this, so that we get clean 'git status'
>> output after a build -- other than configurating Git to ignore file
>> modes -- let me know.
>>
>> I suppose one solution is to just use Command Prompt instead of
>> Cygwin, but then I have to give up other stuff. And another is to use
>> a Mac, which is what most people seem to be doing these days.
>>
>> - Gordon
>>
>>
>> -----Original Message-----
>> From: Alex Harui [mailto:aharui@adobe.com]
>> Sent: Thursday, April 04, 2013 8:46 PM
>> To: dev@flex.apache.org
>> Subject: Re: How to get a clean working tree for flex-sdk
>>
>> Awesome! Thanks.
>>
>>
>> On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
>>
>>> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
>>> to be any in flex-falcon or flex-asjs.
>>>
>>> - Gordon
>>>
>>> -----Original Message-----
>>> From: Gordon Smith [mailto:gosmith@adobe.com]
>>> Sent: Thursday, April 04, 2013 1:31 PM
>>> To: dev@flex.apache.org
>>> Subject: RE: How to get a clean working tree for flex-sdk
>>>
>>> I've pushed the file mode fixes to flex-sdk.
>>>
>>> 'ant clean main checkintests' works for me in Cygwin on Windows.
>>> Please let me know if I screwed anything up on Macs.
>>>
>>> I'll clean up the bad file modes in flex-tlf tonight.
>>>
>>> - Gordon
>>>
>>>
>>> -----Original Message-----
>>> From: Gordon Smith [mailto:gosmith@adobe.com]
>>> Sent: Thursday, April 04, 2013 1:14 PM
>>> To: dev@flex.apache.org
>>> Subject: RE: How to get a clean working tree for flex-sdk
>>>
>>>> After you're done, will a simple pull correct the local repo's?
>>>
>>> I'm not a Git expert, but I'm pretty sure that it will. However, the
>>> fact that many files were marked as "executable" (+x) when they
>>> shouldn't be is not causing any problems that I know of. Fixing this
>>> is just housecleaning.
>>>
>>> - Gordon
>>>
>>> -----Original Message-----
>>> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
>>> Sent: Thursday, April 04, 2013 10:25 AM
>>> To: dev@flex.apache.org
>>> Subject: RE: How to get a clean working tree for flex-sdk
>>>
>>> After you're done, will a simple pull correct the local repo's?
>>>
>>> -Mark
>>>
>>> -----Original Message-----
>>> From: Gordon Smith [mailto:gosmith@adobe.com]
>>> Sent: Thursday, April 04, 2013 1:18 PM
>>> To: dev@flex.apache.org
>>> Subject: RE: How to get a clean working tree for flex-sdk
>>>
>>> I'll work on fixing the bad file modes in the Git repos.
>>>
>>> - Gordon
>>
>> --
>> Alex Harui
>> Flex SDK Team
>> Adobe Systems, Inc.
>> http://blogs.adobe.com/aharui
>>
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Background: I'm trying to get 'git status' to report nothing after simply doing a build of the SDK (which is what you expect because you haven't changed any source files). The problem is that a <copy> of flex-config.xml and a <replace> of Version.java in our Ant scripts seem to misbehave on Cygwin and have the side effect of doing "chmod +x" on these two files. This mode change then makes them show up as changed in 'git status'. Using Ant's <chmod> task to set -x doesn't seem to work.
I don't think Alex's save-a-copy approach will work, because it use <copy>, which is causing the problem in the first place. I looked into his suggestion of doing a git checkout of the problematic files to put them back into their original states. This solves the problem.
But is it OK for the Ant scripts to assume that a command-line git is installed? Some people might only have a Git GUI. And if so, is it OK for them to assume that git is on the path, or should GIT be another environment variable that you have to set?
If we can't use Git, I think I would need to replace the <copy> and <replace> tasks with an <exec> that executes a small Java program (which we would have to compile from source).
Is anybody else doing Apache Flex development using Cygwin?
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Thursday, April 04, 2013 10:44 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Can we get the build to save a copy of these files before modification and then replace them at the end of a build even if the build fails? Or maybe just add git checkout to the build script?
On 4/4/13 9:28 PM, "Gordon Smith" <go...@adobe.com> wrote:
> After adding 3 entries to .gitignore to suppress some build output
> files from showing up in 'git status', I'm now at the point where 'git
> status' after a build shows only this:
>
> gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ 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
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> Git is detecting that the SDK's Ant build scripts change the file mode
> of flex-config.xml (which gets diddled with an Ant <copy>) and
> Version.java (diddled with an Ant <replace>). These tasks seem to have
> the side effect of doing chmod +x for some reason. I've tried using
> <chmod file="..." perm="-x"> to fix this, but it doesn't seem to work.
> Both of these issues are probably some unfortunate interaction between
> Ant and Cygwin, but googling does't confirm this.(It does confirm that
> the people who wrote Ant don't think much of Cygwin.
>
> If anybody has an idea of how to fix this, so that we get clean 'git status'
> output after a build -- other than configurating Git to ignore file
> modes -- let me know.
>
> I suppose one solution is to just use Command Prompt instead of
> Cygwin, but then I have to give up other stuff. And another is to use
> a Mac, which is what most people seem to be doing these days.
>
> - Gordon
>
>
> -----Original Message-----
> From: Alex Harui [mailto:aharui@adobe.com]
> Sent: Thursday, April 04, 2013 8:46 PM
> To: dev@flex.apache.org
> Subject: Re: How to get a clean working tree for flex-sdk
>
> Awesome! Thanks.
>
>
> On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
>> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
>> to be any in flex-falcon or flex-asjs.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:31 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I've pushed the file mode fixes to flex-sdk.
>>
>> 'ant clean main checkintests' works for me in Cygwin on Windows.
>> Please let me know if I screwed anything up on Macs.
>>
>> I'll clean up the bad file modes in flex-tlf tonight.
>>
>> - Gordon
>>
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:14 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>>> After you're done, will a simple pull correct the local repo's?
>>
>> I'm not a Git expert, but I'm pretty sure that it will. However, the
>> fact that many files were marked as "executable" (+x) when they
>> shouldn't be is not causing any problems that I know of. Fixing this
>> is just housecleaning.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
>> Sent: Thursday, April 04, 2013 10:25 AM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> After you're done, will a simple pull correct the local repo's?
>>
>> -Mark
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:18 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I'll work on fixing the bad file modes in the Git repos.
>>
>> - Gordon
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
Can we get the build to save a copy of these files before modification and
then replace them at the end of a build even if the build fails? Or maybe
just add git checkout to the build script?
On 4/4/13 9:28 PM, "Gordon Smith" <go...@adobe.com> wrote:
> After adding 3 entries to .gitignore to suppress some build output files from
> showing up in 'git status', I'm now at the point where 'git status' after a
> build shows only this:
>
> gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
> $ 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
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> Git is detecting that the SDK's Ant build scripts change the file mode of
> flex-config.xml (which gets diddled with an Ant <copy>) and Version.java
> (diddled with an Ant <replace>). These tasks seem to have the side effect of
> doing chmod +x for some reason. I've tried using <chmod file="..." perm="-x">
> to fix this, but it doesn't seem to work. Both of these issues are probably
> some unfortunate interaction between Ant and Cygwin, but googling does't
> confirm this.(It does confirm that the people who wrote Ant don't think much
> of Cygwin.
>
> If anybody has an idea of how to fix this, so that we get clean 'git status'
> output after a build -- other than configurating Git to ignore file modes --
> let me know.
>
> I suppose one solution is to just use Command Prompt instead of Cygwin, but
> then I have to give up other stuff. And another is to use a Mac, which is what
> most people seem to be doing these days.
>
> - Gordon
>
>
> -----Original Message-----
> From: Alex Harui [mailto:aharui@adobe.com]
> Sent: Thursday, April 04, 2013 8:46 PM
> To: dev@flex.apache.org
> Subject: Re: How to get a clean working tree for flex-sdk
>
> Awesome! Thanks.
>
>
> On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
>> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
>> to be any in flex-falcon or flex-asjs.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:31 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I've pushed the file mode fixes to flex-sdk.
>>
>> 'ant clean main checkintests' works for me in Cygwin on Windows.
>> Please let me know if I screwed anything up on Macs.
>>
>> I'll clean up the bad file modes in flex-tlf tonight.
>>
>> - Gordon
>>
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:14 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>>> After you're done, will a simple pull correct the local repo's?
>>
>> I'm not a Git expert, but I'm pretty sure that it will. However, the
>> fact that many files were marked as "executable" (+x) when they
>> shouldn't be is not causing any problems that I know of. Fixing this is just
>> housecleaning.
>>
>> - Gordon
>>
>> -----Original Message-----
>> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
>> Sent: Thursday, April 04, 2013 10:25 AM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> After you're done, will a simple pull correct the local repo's?
>>
>> -Mark
>>
>> -----Original Message-----
>> From: Gordon Smith [mailto:gosmith@adobe.com]
>> Sent: Thursday, April 04, 2013 1:18 PM
>> To: dev@flex.apache.org
>> Subject: RE: How to get a clean working tree for flex-sdk
>>
>> I'll work on fixing the bad file modes in the Git repos.
>>
>> - Gordon
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
After adding 3 entries to .gitignore to suppress some build output files from showing up in 'git status', I'm now at the point where 'git status' after a build shows only this:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ 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
#
no changes added to commit (use "git add" and/or "git commit -a")
Git is detecting that the SDK's Ant build scripts change the file mode of flex-config.xml (which gets diddled with an Ant <copy>) and Version.java (diddled with an Ant <replace>). These tasks seem to have the side effect of doing chmod +x for some reason. I've tried using <chmod file="..." perm="-x"> to fix this, but it doesn't seem to work. Both of these issues are probably some unfortunate interaction between Ant and Cygwin, but googling does't confirm this.(It does confirm that the people who wrote Ant don't think much of Cygwin.
If anybody has an idea of how to fix this, so that we get clean 'git status' output after a build -- other than configurating Git to ignore file modes -- let me know.
I suppose one solution is to just use Command Prompt instead of Cygwin, but then I have to give up other stuff. And another is to use a Mac, which is what most people seem to be doing these days.
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Thursday, April 04, 2013 8:46 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Awesome! Thanks.
On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem
> to be any in flex-falcon or flex-asjs.
>
> - Gordon
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:31 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> I've pushed the file mode fixes to flex-sdk.
>
> 'ant clean main checkintests' works for me in Cygwin on Windows.
> Please let me know if I screwed anything up on Macs.
>
> I'll clean up the bad file modes in flex-tlf tonight.
>
> - Gordon
>
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:14 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
>> After you're done, will a simple pull correct the local repo's?
>
> I'm not a Git expert, but I'm pretty sure that it will. However, the
> fact that many files were marked as "executable" (+x) when they
> shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning.
>
> - Gordon
>
> -----Original Message-----
> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
> Sent: Thursday, April 04, 2013 10:25 AM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> After you're done, will a simple pull correct the local repo's?
>
> -Mark
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:18 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> I'll work on fixing the bad file modes in the Git repos.
>
> - Gordon
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Fred, were you going to make changes to .gitignore?
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 5:24 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
OK, I've cleaned up the bad file modes in flex_tlf. There don't seem to be any in flex-falcon or flex-asjs.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:31 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I've pushed the file mode fixes to flex-sdk.
'ant clean main checkintests' works for me in Cygwin on Windows. Please let me know if I screwed anything up on Macs.
I'll clean up the bad file modes in flex-tlf tonight.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:14 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> After you're done, will a simple pull correct the local repo's?
I'm not a Git expert, but I'm pretty sure that it will. However, the fact that many files were marked as "executable" (+x) when they shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning.
- Gordon
-----Original Message-----
From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
Sent: Thursday, April 04, 2013 10:25 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
Awesome! Thanks.
On 4/4/13 5:24 PM, "Gordon Smith" <go...@adobe.com> wrote:
> OK, I've cleaned up the bad file modes in flex_tlf. There don't seem to be any
> in flex-falcon or flex-asjs.
>
> - Gordon
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:31 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> I've pushed the file mode fixes to flex-sdk.
>
> 'ant clean main checkintests' works for me in Cygwin on Windows. Please let me
> know if I screwed anything up on Macs.
>
> I'll clean up the bad file modes in flex-tlf tonight.
>
> - Gordon
>
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:14 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
>> After you're done, will a simple pull correct the local repo's?
>
> I'm not a Git expert, but I'm pretty sure that it will. However, the fact that
> many files were marked as "executable" (+x) when they shouldn't be is not
> causing any problems that I know of. Fixing this is just housecleaning.
>
> - Gordon
>
> -----Original Message-----
> From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
> Sent: Thursday, April 04, 2013 10:25 AM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> After you're done, will a simple pull correct the local repo's?
>
> -Mark
>
> -----Original Message-----
> From: Gordon Smith [mailto:gosmith@adobe.com]
> Sent: Thursday, April 04, 2013 1:18 PM
> To: dev@flex.apache.org
> Subject: RE: How to get a clean working tree for flex-sdk
>
> I'll work on fixing the bad file modes in the Git repos.
>
> - Gordon
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
OK, I've cleaned up the bad file modes in flex_tlf. There don't seem to be any in flex-falcon or flex-asjs.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:31 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I've pushed the file mode fixes to flex-sdk.
'ant clean main checkintests' works for me in Cygwin on Windows. Please let me know if I screwed anything up on Macs.
I'll clean up the bad file modes in flex-tlf tonight.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:14 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> After you're done, will a simple pull correct the local repo's?
I'm not a Git expert, but I'm pretty sure that it will. However, the fact that many files were marked as "executable" (+x) when they shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning.
- Gordon
-----Original Message-----
From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
Sent: Thursday, April 04, 2013 10:25 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I've pushed the file mode fixes to flex-sdk.
'ant clean main checkintests' works for me in Cygwin on Windows. Please let me know if I screwed anything up on Macs.
I'll clean up the bad file modes in flex-tlf tonight.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:14 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> After you're done, will a simple pull correct the local repo's?
I'm not a Git expert, but I'm pretty sure that it will. However, the fact that many files were marked as "executable" (+x) when they shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning.
- Gordon
-----Original Message-----
From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
Sent: Thursday, April 04, 2013 10:25 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
> After you're done, will a simple pull correct the local repo's?
I'm not a Git expert, but I'm pretty sure that it will. However, the fact that many files were marked as "executable" (+x) when they shouldn't be is not causing any problems that I know of. Fixing this is just housecleaning.
- Gordon
-----Original Message-----
From: Kessler CTR Mark J [mailto:mark.kessler.ctr@usmc.mil]
Sent: Thursday, April 04, 2013 10:25 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
RE: How to get a clean working tree for flex-sdk
Posted by Kessler CTR Mark J <ma...@usmc.mil>.
After you're done, will a simple pull correct the local repo's?
-Mark
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Thursday, April 04, 2013 1:18 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I'll work on fixing the bad file modes in the Git repos.
- Gordon
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I'll work on fixing the bad file modes in the Git repos.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Wednesday, April 03, 2013 5:17 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
My guess is that someone working in SVN had a screwed up auto-props configuration (the part of the config file that maps an added file's extension to a set of svn properties), resulting in lots of added files incorrectly getting svn:executable set.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Wednesday, April 03, 2013 5:02 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties mistakenly had svn:executable set to * in the SVN repo. I'd guess that any files actually in the Git repo that have mode 100755 and shouldn't are due to the same problem originating from incorrect SVN properties. We can simply change their mode and commit new versions with mode 100644. (Any volunteers?)
With frameworks/flex-config.xml and modules/asc/src/java/macromedia/asc/util/Version.java, we have a different issue. I believe they have the right file mode in SVN and in the Git repo, but our build scripts are changing the file mode to executable without needing to do so.
- Gordon
-----Original Message-----
From: Dasa Paddock [mailto:dpaddock@esri.com]
Sent: Wednesday, April 03, 2013 4:47 PM
To: <de...@flex.apache.org>
Subject: Re: How to get a clean working tree for flex-sdk
$ git ls-files --stage | grep "100755"
shows that there are a lot of files that are set as executable that don't need to be, like:
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties
--Dasa
On Apr 3, 2013, at 4:36 PM, Dasa Paddock <dp...@esri.com> wrote:
> You can use this to see what the mode is set to for a file:
>
> $ git ls-files --stage <file>
>
> --Dasa
>
> On Apr 3, 2013, at 4:29 PM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> I just read the git mode particularities from [1]
>>
>> In this case, you're specifying a mode of 100644, which means it's a normal file. Other options are 100755, which means it's an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible - these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
>>
>> -Fred
>>
>> [1] http://git-scm.com/book/en/Git-Internals-Git-Objects
>
>
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
My guess is that someone working in SVN had a screwed up auto-props configuration (the part of the config file that maps an added file's extension to a set of svn properties), resulting in lots of added files incorrectly getting svn:executable set.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Wednesday, April 03, 2013 5:02 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties mistakenly had svn:executable set to * in the SVN repo. I'd guess that any files actually in the Git repo that have mode 100755 and shouldn't are due to the same problem originating from incorrect SVN properties. We can simply change their mode and commit new versions with mode 100644. (Any volunteers?)
With frameworks/flex-config.xml and modules/asc/src/java/macromedia/asc/util/Version.java, we have a different issue. I believe they have the right file mode in SVN and in the Git repo, but our build scripts are changing the file mode to executable without needing to do so.
- Gordon
-----Original Message-----
From: Dasa Paddock [mailto:dpaddock@esri.com]
Sent: Wednesday, April 03, 2013 4:47 PM
To: <de...@flex.apache.org>
Subject: Re: How to get a clean working tree for flex-sdk
$ git ls-files --stage | grep "100755"
shows that there are a lot of files that are set as executable that don't need to be, like:
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties
--Dasa
On Apr 3, 2013, at 4:36 PM, Dasa Paddock <dp...@esri.com> wrote:
> You can use this to see what the mode is set to for a file:
>
> $ git ls-files --stage <file>
>
> --Dasa
>
> On Apr 3, 2013, at 4:29 PM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> I just read the git mode particularities from [1]
>>
>> In this case, you're specifying a mode of 100644, which means it's a normal file. Other options are 100755, which means it's an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible - these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
>>
>> -Fred
>>
>> [1] http://git-scm.com/book/en/Git-Internals-Git-Objects
>
>
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties mistakenly had svn:executable set to * in the SVN repo. I'd guess that any files actually in the Git repo that have mode 100755 and shouldn't are due to the same problem originating from incorrect SVN properties. We can simply change their mode and commit new versions with mode 100644. (Any volunteers?)
With frameworks/flex-config.xml and modules/asc/src/java/macromedia/asc/util/Version.java, we have a different issue. I believe they have the right file mode in SVN and in the Git repo, but our build scripts are changing the file mode to executable without needing to do so.
- Gordon
-----Original Message-----
From: Dasa Paddock [mailto:dpaddock@esri.com]
Sent: Wednesday, April 03, 2013 4:47 PM
To: <de...@flex.apache.org>
Subject: Re: How to get a clean working tree for flex-sdk
$ git ls-files --stage | grep "100755"
shows that there are a lot of files that are set as executable that don't need to be, like:
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties
--Dasa
On Apr 3, 2013, at 4:36 PM, Dasa Paddock <dp...@esri.com> wrote:
> You can use this to see what the mode is set to for a file:
>
> $ git ls-files --stage <file>
>
> --Dasa
>
> On Apr 3, 2013, at 4:29 PM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> I just read the git mode particularities from [1]
>>
>> In this case, you're specifying a mode of 100644, which means it's a normal file. Other options are 100755, which means it's an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible - these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
>>
>> -Fred
>>
>> [1] http://git-scm.com/book/en/Git-Internals-Git-Objects
>
>
Re: How to get a clean working tree for flex-sdk
Posted by Dasa Paddock <dp...@esri.com>.
$ git ls-files --stage | grep "100755"
shows that there are a lot of files that are set as executable that don't need to be, like:
frameworks/projects/advancedgrids/bundles/en_GB/datamanagement.properties
--Dasa
On Apr 3, 2013, at 4:36 PM, Dasa Paddock <dp...@esri.com> wrote:
> You can use this to see what the mode is set to for a file:
>
> $ git ls-files --stage <file>
>
> --Dasa
>
> On Apr 3, 2013, at 4:29 PM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> I just read the git mode particularities from [1]
>>
>> In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible — these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
>>
>> -Fred
>>
>> [1] http://git-scm.com/book/en/Git-Internals-Git-Objects
>
>
Re: How to get a clean working tree for flex-sdk
Posted by Dasa Paddock <dp...@esri.com>.
You can use this to see what the mode is set to for a file:
$ git ls-files --stage <file>
--Dasa
On Apr 3, 2013, at 4:29 PM, Frédéric THOMAS <we...@hotmail.com>
wrote:
> I just read the git mode particularities from [1]
>
> In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible — these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules).
>
> -Fred
>
> [1] http://git-scm.com/book/en/Git-Internals-Git-Objects
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
I just read the git mode particularities from [1]
In this case, you’re specifying a mode of 100644, which means it’s a normal
file. Other options are 100755, which means it’s an executable file; and
120000, which specifies a symbolic link. The mode is taken from normal UNIX
modes but is much less flexible — these three modes are the only ones that
are valid for files (blobs) in Git (although other modes are used for
directories and submodules).
-Fred
[1] http://git-scm.com/book/en/Git-Internals-Git-Objects
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 1:26 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
The Ant scripts are rewriting these files to inject version numbers. (Ugh!)
So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to
set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style
property set, like many other files.
When you check out a Git branch, can some files get a different mode than
others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the
build, maybe we should find how they were in Svn, it might have happened
that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be
changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
The Ant scripts are rewriting these files to inject version numbers. (Ugh!) So many your suggestion of ignoring mode differences is a good idea.
However, I would still like to understand whether it is possible for Git to set the executable bit on scripts like mxmlc, like Subversion did.
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Wednesday, April 03, 2013 4:22 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files.
When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 4:00 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
You might be right, it's better to determinate why they're changed by the
build, maybe we should find how they were in Svn, it might have happened
that those modes changed during the migration.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:53 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
I don't think there is any reason why the file mode of these files should be
changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:52 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Yes.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:50 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Are you saying that it tells Git to ignore differences in a file's mode?
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:48 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
It will avoid git to consider those files as modified, so they won't appear on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
It will avoid git to consider those files as modified, so they won't appear
on git status
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:39 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be
aware that there are some files that need to have their executable bit set,
such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml
b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff
modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
> that there are some files that need to have their executable bit set, such as the mxmlc script.
I knew how to make that happen in SVN, with per-file properties, but I have no idea in Git.
- Gordon
-----Original Message-----
From: Gordon Smith [mailto:gosmith@adobe.com]
Sent: Wednesday, April 03, 2013 3:39 PM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script.
- Gordon
-----Original Message-----
From: Frédéric THOMAS [mailto:webdoublefx@hotmail.com]
Sent: Wednesday, April 03, 2013 3:36 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
or 'git config --global core.filemode false' for the general git settings.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, April 04, 2013 12:34 AM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff frameworks/flex-config.xml
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
old mode 100644
new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Frédéric THOMAS <we...@hotmail.com>.
Then I guess everybody should run 'git config core.filemode false' on their
repos, I will add it to the wiki.
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Thursday, April 04, 2013 12:29 AM
To: dev@flex.apache.org
Subject: RE: How to get a clean working tree for flex-sdk
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff frameworks/flex-config.xml
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
old mode 100644
new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java
b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
RE: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
> I'd be curious as to what did change in flex-config and Version.java.
Something changed the mode of these two files:
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff frameworks/flex-config.xml
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
old mode 100644
new mode 100755
gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk
$ git diff modules/asc/src/java/macromedia/asc/util/Version.java
diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java b/modules/asc/src/java/macromedia/asc/util/Version.java
old mode 100644
new mode 100755
- Gordon
-----Original Message-----
From: Alex Harui [mailto:aharui@adobe.com]
Sent: Tuesday, April 02, 2013 9:30 PM
To: dev@flex.apache.org
Subject: Re: How to get a clean working tree for flex-sdk
"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" <go...@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
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
Hmm. I did a pull and build and those don't show up. Not sure why that's
happening for you.
On 4/2/13 9:37 PM, "Gordon Smith" <go...@adobe.com> wrote:
> 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" <ah...@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" <go...@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
>>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: How to get a clean working tree for flex-sdk
Posted by Gordon Smith <go...@adobe.com>.
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" <ah...@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" <go...@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
>
Re: How to get a clean working tree for flex-sdk
Posted by Alex Harui <ah...@adobe.com>.
"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" <go...@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