flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Frédéric THOMAS <webdoubl...@hotmail.com>
Subject Re: asdoc - Release build broken (was: Release build broken)
Date Tue, 26 Mar 2013 17:50:42 GMT
Ok, I double checked, all good for the release except the build number and
the asdoc, so, TLF, empty.properties and .gitignore are ok.

If someone wants to give a hand for the asdoc,  run the asdoc target of the
experimental build after you built the sdk.
Once fixed, uncomment <ant dir="${basedir}/projects/experimental"
target="doc" /> in framework.build.xml, commit prepending the message with
the jira issue id and push it, I'll merge later, after we'll find the best
way for the build number.

If you want to work on, I created a remote branch 'FLEX-33451'  for 
https://issues.apache.org/jira/browse/FLEX-33451

I assume you're on flex-sdk, whatever the branch you're currently on.

Before to check it out:
git stash -u "my current work"

To check it out:
git checkout -b origin/FLEX-33451

To see what I did (I assume, you set your .gitconfig as described on the
wiki)
git hist

To see what there's inside a particular commit:
git show <HASH> (can be obtain form the previous command)

If you need to update from origin/develop to FLEX-33451:
git pull --rebase origin develop

To add a file to the staged area:
git add <My_FILE>

To add all the current files to the staged area:
git add .

To commit:
git pull --rebase (if I just pushed the same files than the ones you're
trying to commit, resolve the conflicts)
git commit -m "FLEX-33451:<MESSAGE>"

To push:
git push

To go back on the branch you was before and the same working tree / index:
git stash -u "release" (if you've got uncommitted files/untracked files
which you can check with git status)
git checkout <BRANCH>
git stash apply "my current work"

Thanks,
-Fred 


Mime
View raw message