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:webdoubl...@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:webdoubl...@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:webdoubl...@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 = gosm...@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:webdoubl...@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")
