Re: git commit: Removed files that do actually need to be edited and commited from time to time
On 3/25/13 2:11 PM, "Justin Mclean" wrote: > HI, > >> 1) flex-sdk-description.xml is autogenerated from a build.xml > From the template file which needs to be in GIt. To me, the build.xml looks like it just echoes some text to the file. I don't see a template. > >> 2) spark/manifest.xml is copied from frameworks/spark-manifest.xml > So we need one in Git but not the other. I think I see frameworks/spark-manifest.xml under version control. Are you not seeing it? -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: git commit: Removed files that do actually need to be edited and commited from time to time
HI, > 1) flex-sdk-description.xml is autogenerated from a build.xml From the template file which needs to be in GIt. > 2) spark/manifest.xml is copied from frameworks/spark-manifest.xml So we need one in Git but not the other. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
IMO, Fred had it right. There are some files that go in the release distribution that we left sitting around in SVN, but they were in fact generated. Often folks would mistakenly edit the generated file and then wonder why their changes didn't take. I haven't researched bundles.properties, but I'm pretty sure: 1) flex-sdk-description.xml is autogenerated from a build.xml 2) spark/manifest.xml is copied from frameworks/spark-manifest.xml The latter burned me once when trying to add a new component to spark swc. On 3/25/13 12:58 AM, "Frédéric THOMAS" wrote: > Well, It's where I don't understand though. > > If those files are generated during the build, they are also generated > during the release, right ? > > Thanks for your time, > -Fred > > -Message d'origine- > From: Justin Mclean > Sent: Monday, March 25, 2013 8:52 AM > To: dev@flex.apache.org > Subject: Re: git commit: Removed files that do actually need to be edited > and commited from time to time > > Hi, > >> your solution to add them into Git seems a bit drastic to me, instead, >> could you add them again in the .gitignore and tell me what commands you >> did and what errors were displayed ? > Files in question were auto generated by me (to same me typing) but are > actually required if you want to do a release build so need to be in Git. > They were not required if you just built for en_US. > > Justin > -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: git commit: Removed files that do actually need to be edited and commited from time to time
I'm with the JDK 1.6.0_33 but that's ok, the server is running properly again. Thanks, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 1:32 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, No sure what your issue is - try this url: http://www.oracle.com/technetwork/java/javase/downloads/index.html You want JDK SE 7 or JDK SE 6. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, No sure what your issue is - try this url: http://www.oracle.com/technetwork/java/javase/downloads/index.html You want JDK SE 7 or JDK SE 6. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
No, indeed I've got java installed, I can now access the web site but now the download, they say : We're sorry, but something went wrong. We've been notified about this issue and we'll take a look at it shortly I'll try later, thank you, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 1:24 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, I had an issue running a release, it can't get http://java.net/projects/javacc/downloads/download/javacc-5.0.tar.gz error 443, how do I solve that ? It's not the ant script getting that right? Sounds like you don't have a JDK installed? What does 'java -version" and "javac -version" give you? Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > I had an issue running a release, it can't get > http://java.net/projects/javacc/downloads/download/javacc-5.0.tar.gz error > 443, how do I solve that ? It's not the ant script getting that right? Sounds like you don't have a JDK installed? What does 'java -version" and "javac -version" give you? Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
HI, > True, so how do you sort that out at the moment ? Just let it fail - it sets the release version to 0. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Sorry, the 443 came when I tried to get via my browser, the ant script returned "Server returned HTTP response code: 500", I'll try later as it is an internal server error. -Fred -Message d'origine- From: Frédéric THOMAS Sent: Monday, March 25, 2013 1:12 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time I had an issue running a release, it can't get http://java.net/projects/javacc/downloads/download/javacc-5.0.tar.gz error 443, how do I solve that ? -Fred -Message d'origine- From: Frédéric THOMAS Sent: Monday, March 25, 2013 10:41 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time True, so how do you sort that out at the moment ? -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 10:36 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time HI, Just be aware that "ant release" is currently a little broken because of the move to Get (it assumes a SVN revision number). Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
I had an issue running a release, it can't get http://java.net/projects/javacc/downloads/download/javacc-5.0.tar.gz error 443, how do I solve that ? -Fred -Message d'origine- From: Frédéric THOMAS Sent: Monday, March 25, 2013 10:41 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time True, so how do you sort that out at the moment ? -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 10:36 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time HI, Just be aware that "ant release" is currently a little broken because of the move to Get (it assumes a SVN revision number). Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
True, so how do you sort that out at the moment ? -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 10:36 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time HI, Just be aware that "ant release" is currently a little broken because of the move to Get (it assumes a SVN revision number). Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
HI, Just be aware that "ant release" is currently a little broken because of the move to Get (it assumes a SVN revision number). Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > 1- The flex-sdk-descrition.xml and the bundle.properties are generated. > 2- For the Mustella tests, as soon as I have the opportunity to run it, I'll > fill the .gitignore in a almost complete generic way, I guess I can do it and > propose it to this list as I did for the actual one. An "ant release" (which also runs the mustella checkin tests should be enough for starters. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
No issue. I not checked any photos of my grandmother yet :-) Ok, let's go forward so ;-) Not sure any decision has been made here other than what was in .gitignore stop me from pushing files that are required to make a release build. We can modify .gitignore as required until everyone is happy with it. I guess doing a release in a local branch should solve your untracked files problems, tell me if I'm wrong ? So, the one of the develop branch could be restored. Thanks, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 9:55 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, Well, sorry for the irritation you might have feel from my last post, happily, no files have been checked in by mistake yet. No issue. I not checked any photos of my grandmother yet :-) The point is almost none of us knows Git, even people who voted on and the decisions taken implying everybody without coordination at this early stage of the Git learning curve irritated me bit. Couldn't agree with you more. Before a decision be taken Not sure any decision has been made here other than what was in .gitignore stop me from pushing files that are required to make a release build. We can modify .gitignore as required until everyone is happy with it. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Ok, Can't we try to do a dummy release (or a real one as IIRC, one of the core lib hasn't been built correctly in the 2 last releases), so we could fill what is missing in the wiki and in the same time we could experiment Git for a release and fill a .gitignore ? Btw, because I didn't do any SDK release yet, I probably might miss things to understand your points, I want to sweep that. Well, that's a proposal that even if you approve it now will have to be delayed until the Installer has been released and I played with Mustella to update the .gitignore Thanks, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 9:51 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, But, sorry, the official release build is not supposed to go into a release branch ? No but the files needed to compile a release need to be :-) otherwise guys, why not check in *.swc, .zip and my grand mother photo at this point ? No swc or zips should be in Git but we might be able to get a photo of your grandmother into a mustella test :-) you can easily turn back on the develop branch doing a git statsh -u "my release untracked files" before. Given I might have a few hundred files scattered all over what would be the best way to do this? ie some I want to push but others I don't. Objvious only ones I commit will be pushed but I can't do a pull rebase in this state. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > Well, sorry for the irritation you might have feel from my last post, > happily, no files have been checked in by mistake yet. No issue. I not checked any photos of my grandmother yet :-) > The point is almost none of us knows Git, even people who voted on and the > decisions taken implying everybody without coordination at this early stage > of the Git learning curve irritated me bit. Couldn't agree with you more. > Before a decision be taken Not sure any decision has been made here other than what was in .gitignore stop me from pushing files that are required to make a release build. We can modify .gitignore as required until everyone is happy with it. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Well, sure it's different than Svn. 1- The flex-sdk-descrition.xml and the bundle.properties are generated. 2- For the Mustella tests, as soon as I have the opportunity to run it, I'll fill the .gitignore in a almost complete generic way, I guess I can do it and propose it to this list as I did for the actual one. Actually, you can always use "git stash -u " before to checkout another branch, that save headaches :) Can I checkout and checkin the .gitignore as it was before, is that ok for you now ? Thanks, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 9:44 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, If those files are generated during the build, they are also generated during the release, right ? Not all those files are auto generated and I think (not 100% sure of the top of my head) that some file names may be both auto generated and also need to be part of the release. Currently any Flex SDK release build or SDK with test run will currently will have file they you shouldn't check that are not in .gitignore but it may be hard to specify them as they are fairly generic eg Mustella results (txt, images and xml files) or properties files and xml config files. This wasn't an issue in SVN as there no need to check everything in. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > But, sorry, the official release build is not supposed to go into a release > branch ? No but the files needed to compile a release need to be :-) > otherwise guys, why not check in *.swc, .zip and my grand mother photo at > this point ? No swc or zips should be in Git but we might be able to get a photo of your grandmother into a mustella test :-) > you can easily turn back on the develop branch doing a git statsh -u "my > release untracked files" before. Given I might have a few hundred files scattered all over what would be the best way to do this? ie some I want to push but others I don't. Objvious only ones I commit will be pushed but I can't do a pull rebase in this state. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > If those files are generated during the build, they are also generated during > the release, right ? Not all those files are auto generated and I think (not 100% sure of the top of my head) that some file names may be both auto generated and also need to be part of the release. Currently any Flex SDK release build or SDK with test run will currently will have file they you shouldn't check that are not in .gitignore but it may be hard to specify them as they are fairly generic eg Mustella results (txt, images and xml files) or properties files and xml config files. This wasn't an issue in SVN as there no need to check everything in. Thanks, Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Well, sorry for the irritation you might have feel from my last post, happily, no files have been checked in by mistake yet. The point is almost none of us knows Git, even people who voted on and the decisions taken implying everybody without coordination at this early stage of the Git learning curve irritated me bit. Before a decision be taken, I guess we can ask the list if something looks weird or is not clear, even though the Apache Way is do it, we can go back later, I think at time it is good to ask before. Sorry again, -Fred -Message d'origine- From: Frédéric THOMAS Sent: Monday, March 25, 2013 9:12 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time But, sorry, the official release build is not supposed to go into a release branch ? a personal release into a local release branch ? so, can't you custom the .gitignore in those branches instead of check in the develop branch files that shouldn't go in ? otherwise guys, why not check in *.swc, .zip and my grand mother photo at this point ? From once of those branch, you can easily turn back on the develop branch doing a git statsh -u "my release untracked files" before. Thanks, -Fred -Message d'origine- From: Erik de Bruin Sent: Monday, March 25, 2013 9:02 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time I think Justin is saying they are needed if you want to prepare a release build of the SDK (e.g. 4.9.5), not when you just build the SDK on your own machine. In this case I'd on the word of Justin and leave the files in git. EdB On Mon, Mar 25, 2013 at 8:58 AM, Frédéric THOMAS wrote: Well, It's where I don't understand though. If those files are generated during the build, they are also generated during the release, right ? Thanks for your time, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 8:52 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, your solution to add them into Git seems a bit drastic to me, instead, could you add them again in the .gitignore and tell me what commands you did and what errors were displayed ? Files in question were auto generated by me (to same me typing) but are actually required if you want to do a release build so need to be in Git. They were not required if you just built for en_US. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: git commit: Removed files that do actually need to be edited and commited from time to time
But, sorry, the official release build is not supposed to go into a release branch ? a personal release into a local release branch ? so, can't you custom the .gitignore in those branches instead of check in the develop branch files that shouldn't go in ? otherwise guys, why not check in *.swc, .zip and my grand mother photo at this point ? From once of those branch, you can easily turn back on the develop branch doing a git statsh -u "my release untracked files" before. Thanks, -Fred -Message d'origine- From: Erik de Bruin Sent: Monday, March 25, 2013 9:02 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time I think Justin is saying they are needed if you want to prepare a release build of the SDK (e.g. 4.9.5), not when you just build the SDK on your own machine. In this case I'd on the word of Justin and leave the files in git. EdB On Mon, Mar 25, 2013 at 8:58 AM, Frédéric THOMAS wrote: Well, It's where I don't understand though. If those files are generated during the build, they are also generated during the release, right ? Thanks for your time, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 8:52 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, your solution to add them into Git seems a bit drastic to me, instead, could you add them again in the .gitignore and tell me what commands you did and what errors were displayed ? Files in question were auto generated by me (to same me typing) but are actually required if you want to do a release build so need to be in Git. They were not required if you just built for en_US. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: git commit: Removed files that do actually need to be edited and commited from time to time
I think Justin is saying they are needed if you want to prepare a release build of the SDK (e.g. 4.9.5), not when you just build the SDK on your own machine. In this case I'd on the word of Justin and leave the files in git. EdB On Mon, Mar 25, 2013 at 8:58 AM, Frédéric THOMAS wrote: > Well, It's where I don't understand though. > > If those files are generated during the build, they are also generated > during the release, right ? > > Thanks for your time, > > -Fred > > -Message d'origine- From: Justin Mclean > Sent: Monday, March 25, 2013 8:52 AM > > To: dev@flex.apache.org > Subject: Re: git commit: Removed files that do actually need to be edited > and commited from time to time > > Hi, > >> your solution to add them into Git seems a bit drastic to me, instead, >> could you add them again in the .gitignore and tell me what commands you did >> and what errors were displayed ? > > Files in question were auto generated by me (to same me typing) but are > actually required if you want to do a release build so need to be in Git. > They were not required if you just built for en_US. > > Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Well, It's where I don't understand though. If those files are generated during the build, they are also generated during the release, right ? Thanks for your time, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 8:52 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, your solution to add them into Git seems a bit drastic to me, instead, could you add them again in the .gitignore and tell me what commands you did and what errors were displayed ? Files in question were auto generated by me (to same me typing) but are actually required if you want to do a release build so need to be in Git. They were not required if you just built for en_US. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > your solution to add them into Git seems a bit drastic to me, instead, could > you add them again in the .gitignore and tell me what commands you did and > what errors were displayed ? Files in question were auto generated by me (to same me typing) but are actually required if you want to do a release build so need to be in Git. They were not required if you just built for en_US. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Ok, then maybe we can find the solution somewhere else as it wasn't a problem for me, and once again, because those files are generated, they shouldn't go into Git, are we agree ? your solution to add them into Git seems a bit drastic to me, instead, could you add them again in the .gitignore and tell me what commands you did and what errors were displayed ? I might help on this. Thanks, -Fred -Message d'origine- From: Justin Mclean Sent: Monday, March 25, 2013 8:34 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time HI, Again, I' woukd like to understand, why included thoses files in Git ? Because they stopped me from checking in the locale changes I made the other day. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
HI, > Again, I' woukd like to understand, why included thoses files in Git ? Because they stopped me from checking in the locale changes I made the other day. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi Justin, Again, I' woukd like to understand, why included thoses files in Git ? they weren't in Svn and from what I understand, the flex-sdk-description.xml and the bundles.properties are generated at compile time. Where am I wrong if I am ? Thanks, -Fred -Message d'origine- From: Frédéric THOMAS Sent: Saturday, March 23, 2013 1:27 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Ok, just because I see them as untracked and they're not in svn either. IIRC, they have been generated I might be wrong ? -Fred -Message d'origine- From: Justin Mclean Sent: Saturday, March 23, 2013 1:16 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, I didn't get that, those files are generated, why they shouldn't be ignored ? do they have to be committed ? They are not auto generated, can change and do need to be committed. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Ok, just because I see them as untracked and they're not in svn either. IIRC, they have been generated I might be wrong ? -Fred -Message d'origine- From: Justin Mclean Sent: Saturday, March 23, 2013 1:16 PM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, I didn't get that, those files are generated, why they shouldn't be ignored ? do they have to be committed ? They are not auto generated, can change and do need to be committed. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, > I didn't get that, those files are generated, why they shouldn't be ignored ? > do they have to be committed ? They are not auto generated, can change and do need to be committed. Justin
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi Erik, If you are talking about the IDE files, it's good to have them here, we never know which IDE the committer will use, otherwise, yes, you can clean up unnecessary files/directories. -Fred -Message d'origine- From: Erik de Bruin Sent: Saturday, March 23, 2013 9:21 AM To: dev@flex.apache.org Subject: Re: git commit: Removed files that do actually need to be edited and commited from time to time Hi, This give me the opportunity to talk about this: shouldn't the project specific .gitignore files not contain ONLY the files that need to be ignored for that project? Having some general filetypes/patterns in there isn't needed and might even cause errors because git wouldn't pick up files covered by that, while the author might need to include them. EdB On Sat, Mar 23, 2013 at 8:07 AM, Frédéric THOMAS wrote: Hi Justin, I didn't get that, those files are generated, why they shouldn't be ignored ? do they have to be committed ? Thanks, -Fred -Message d'origine- From: jmcl...@apache.org Sent: Friday, March 22, 2013 10:00 AM To: comm...@flex.apache.org Subject: git commit: Removed files that do actually need to be edited and commited from time to time Updated Branches: refs/heads/develop 82b305ebd -> c81ae8cff Removed files that do actually need to be edited and commited from time to time Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c81ae8cf Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c81ae8cf Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c81ae8cf Branch: refs/heads/develop Commit: c81ae8cffc36565d2a3c6cc18c85114ae0041f07 Parents: 82b305e Author: Justin Mclean Authored: Fri Mar 22 20:00:01 2013 +1100 Committer: Justin Mclean Committed: Fri Mar 22 20:00:01 2013 +1100 -- .gitignore |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c81ae8cf/.gitignore -- diff --git a/.gitignore b/.gitignore index ce2facb..0c84fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,16 +41,12 @@ META-INF/ *.vms *.ser *.mxp -bundles.properties -empty.properties css_*.properties FXGException_*.properties FXGLog_*.properties FABridge.js -frameworks/projects/spark/manifest.xml env.properties local.properties -flex-sdk-description.xml #OS junk files [Tt]humbs.db @@ -108,4 +104,4 @@ _ReSharper*/ #Compressed Files *.zip *.rar -*.tar \ No newline at end of file +*.tar -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi, This give me the opportunity to talk about this: shouldn't the project specific .gitignore files not contain ONLY the files that need to be ignored for that project? Having some general filetypes/patterns in there isn't needed and might even cause errors because git wouldn't pick up files covered by that, while the author might need to include them. EdB On Sat, Mar 23, 2013 at 8:07 AM, Frédéric THOMAS wrote: > Hi Justin, > > I didn't get that, those files are generated, why they shouldn't be ignored > ? do they have to be committed ? > > Thanks, > -Fred > > -Message d'origine- From: jmcl...@apache.org > Sent: Friday, March 22, 2013 10:00 AM > To: comm...@flex.apache.org > Subject: git commit: Removed files that do actually need to be edited and > commited from time to time > > > Updated Branches: > refs/heads/develop 82b305ebd -> c81ae8cff > > > Removed files that do actually need to be edited and commited from time to > time > > > Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo > Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c81ae8cf > Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c81ae8cf > Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c81ae8cf > > Branch: refs/heads/develop > Commit: c81ae8cffc36565d2a3c6cc18c85114ae0041f07 > Parents: 82b305e > Author: Justin Mclean > Authored: Fri Mar 22 20:00:01 2013 +1100 > Committer: Justin Mclean > Committed: Fri Mar 22 20:00:01 2013 +1100 > > -- > .gitignore |6 +- > 1 files changed, 1 insertions(+), 5 deletions(-) > -- > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c81ae8cf/.gitignore > -- > diff --git a/.gitignore b/.gitignore > index ce2facb..0c84fc3 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -41,16 +41,12 @@ META-INF/ > *.vms > *.ser > *.mxp > -bundles.properties > -empty.properties > css_*.properties > FXGException_*.properties > FXGLog_*.properties > FABridge.js > -frameworks/projects/spark/manifest.xml > env.properties > local.properties > -flex-sdk-description.xml > > #OS junk files > [Tt]humbs.db > @@ -108,4 +104,4 @@ _ReSharper*/ > #Compressed Files > *.zip > *.rar > -*.tar > \ No newline at end of file > +*.tar > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: git commit: Removed files that do actually need to be edited and commited from time to time
Hi Justin, I didn't get that, those files are generated, why they shouldn't be ignored ? do they have to be committed ? Thanks, -Fred -Message d'origine- From: jmcl...@apache.org Sent: Friday, March 22, 2013 10:00 AM To: comm...@flex.apache.org Subject: git commit: Removed files that do actually need to be edited and commited from time to time Updated Branches: refs/heads/develop 82b305ebd -> c81ae8cff Removed files that do actually need to be edited and commited from time to time Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c81ae8cf Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c81ae8cf Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c81ae8cf Branch: refs/heads/develop Commit: c81ae8cffc36565d2a3c6cc18c85114ae0041f07 Parents: 82b305e Author: Justin Mclean Authored: Fri Mar 22 20:00:01 2013 +1100 Committer: Justin Mclean Committed: Fri Mar 22 20:00:01 2013 +1100 -- .gitignore |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c81ae8cf/.gitignore -- diff --git a/.gitignore b/.gitignore index ce2facb..0c84fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,16 +41,12 @@ META-INF/ *.vms *.ser *.mxp -bundles.properties -empty.properties css_*.properties FXGException_*.properties FXGLog_*.properties FABridge.js -frameworks/projects/spark/manifest.xml env.properties local.properties -flex-sdk-description.xml #OS junk files [Tt]humbs.db @@ -108,4 +104,4 @@ _ReSharper*/ #Compressed Files *.zip *.rar -*.tar \ No newline at end of file +*.tar
