Re: TLF Issue (was Re: SVN to Git migration in progress)
I maybe found another way to integrate TLF sub directories as part of flex-sdk [1], still have to try it but sounds good. -Fred [1] https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html -Message d'origine- From: Frédéric THOMAS Sent: Wednesday, March 13, 2013 11:43 AM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) BTW, are these separate repos as far as Git is concerned or something else?) Humm..Can you reformulate that pls ? :P The only way I see if we don't want to use links is to use submodules but to use TLF as a submodule, it's root should be its sub directory textLayout so is that what we want ? -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 8:11 PM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) I think we don't want to use hard-links. And if submodules won't work, then I think it is time to figure out how to cut releases by grabbing stuff from different repos. (BTW, are these separate repos as far as Git is concerned or something else?) At Adobe, TLF was developed in Perforce by another team and we took drops for Flex. I'm sure we can do something similar. On 3/12/13 11:37 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: TLF Issue (was Re: SVN to Git migration in progress)
Arff, bad luck, it acts as submodule. -Message d'origine- From: Frédéric THOMAS Sent: Thursday, March 14, 2013 9:25 AM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) I maybe found another way to integrate TLF sub directories as part of flex-sdk [1], still have to try it but sounds good. -Fred [1] https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html -Message d'origine- From: Frédéric THOMAS Sent: Wednesday, March 13, 2013 11:43 AM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) BTW, are these separate repos as far as Git is concerned or something else?) Humm..Can you reformulate that pls ? :P The only way I see if we don't want to use links is to use submodules but to use TLF as a submodule, it's root should be its sub directory textLayout so is that what we want ? -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 8:11 PM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) I think we don't want to use hard-links. And if submodules won't work, then I think it is time to figure out how to cut releases by grabbing stuff from different repos. (BTW, are these separate repos as far as Git is concerned or something else?) At Adobe, TLF was developed in Perforce by another team and we took drops for Flex. I'm sure we can do something similar. On 3/12/13 11:37 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: TLF Issue (was Re: SVN to Git migration in progress)
yep, the only way I found to resolve this at the moment was to create a hard link to textLayout sub directory of the flex-tlf git project. -Fred -Message d'origine- From: Kessler CTR Mark J Sent: Thursday, March 14, 2013 10:53 AM To: dev@flex.apache.org Subject: RE: TLF Issue (was Re: SVN to Git migration in progress) Would this be why I got a failed build on the text layout portion of the git develop branch? compile: [compc] Loading configuration file D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile-config.xml [compc] Apache Flex compc (Component Compiler) [compc] Version 4.10.0 build 0 [compc] Copyright 2012 The Apache Software Foundation. [compc] [compc] D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile- config.xml(58): Error: unable to open 'D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout/3.0.33/manifest.xml' [compc] [compc] /include-file [compc] BUILD FAILED D:\Development\Flex\Flex-SDK\build.xml:361: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:91: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:387: The following error occur red while executing this line: D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\build.xml:179: compc task failed. Total time: 1 minute 3 seconds -Mark -Original Message- From: Alex Harui [mailto:aha...@adobe.com] Sent: Tuesday, March 12, 2013 1:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
RE: TLF Issue (was Re: SVN to Git migration in progress)
Did you use the fsutil hardlink create NewFilename ExistingFilename ? -Mark -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Thursday, March 14, 2013 6:01 AM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) yep, the only way I found to resolve this at the moment was to create a hard link to textLayout sub directory of the flex-tlf git project. -Fred -Message d'origine- From: Kessler CTR Mark J Sent: Thursday, March 14, 2013 10:53 AM To: dev@flex.apache.org Subject: RE: TLF Issue (was Re: SVN to Git migration in progress) Would this be why I got a failed build on the text layout portion of the git develop branch? compile: [compc] Loading configuration file D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile-config.xml [compc] Apache Flex compc (Component Compiler) [compc] Version 4.10.0 build 0 [compc] Copyright 2012 The Apache Software Foundation. [compc] [compc] D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile- config.xml(58): Error: unable to open 'D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout/3.0.33/manifest.xml' [compc] [compc] /include-file [compc] BUILD FAILED D:\Development\Flex\Flex-SDK\build.xml:361: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:91: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:387: The following error occur red while executing this line: D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\build.xml:179: compc task failed. Total time: 1 minute 3 seconds -Mark -Original Message- From: Alex Harui [mailto:aha...@adobe.com] Sent: Tuesday, March 12, 2013 1:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: TLF Issue (was Re: SVN to Git migration in progress)
No I used Symbolic Links for windows [1] You create a junction from flex-tlf/textLayout to project/framework/textLayout/3.0.33 You'll have to rename the freshly created textLayout under junction folder (under project/framework/textLayout/) to 3.0.33 -Fred [1] http://www.howtogeek.com/howto/16226/complete-guide-to-symbolic-links-symlinks-on-windows-or-linux/ -Message d'origine- From: Kessler CTR Mark J Sent: Thursday, March 14, 2013 11:20 AM To: dev@flex.apache.org Subject: RE: TLF Issue (was Re: SVN to Git migration in progress) Did you use the fsutil hardlink create NewFilename ExistingFilename ? -Mark -Original Message- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Thursday, March 14, 2013 6:01 AM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) yep, the only way I found to resolve this at the moment was to create a hard link to textLayout sub directory of the flex-tlf git project. -Fred -Message d'origine- From: Kessler CTR Mark J Sent: Thursday, March 14, 2013 10:53 AM To: dev@flex.apache.org Subject: RE: TLF Issue (was Re: SVN to Git migration in progress) Would this be why I got a failed build on the text layout portion of the git develop branch? compile: [compc] Loading configuration file D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile-config.xml [compc] Apache Flex compc (Component Compiler) [compc] Version 4.10.0 build 0 [compc] Copyright 2012 The Apache Software Foundation. [compc] [compc] D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\compile- config.xml(58): Error: unable to open 'D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout/3.0.33/manifest.xml' [compc] [compc] /include-file [compc] BUILD FAILED D:\Development\Flex\Flex-SDK\build.xml:361: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:91: The following error occurred while executing this line: D:\Development\Flex\Flex-SDK\frameworks\build.xml:387: The following error occur red while executing this line: D:\Development\Flex\Flex-SDK\frameworks\projects\textLayout\build.xml:179: compc task failed. Total time: 1 minute 3 seconds -Mark -Original Message- From: Alex Harui [mailto:aha...@adobe.com] Sent: Tuesday, March 12, 2013 1:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
Erik, Here's an example of how a git workflow can look like: http://nvie.com/posts/a-successful-git-branching-model/ While this is not necessarily the branching model that the Apache Flex project will use, it should give you a better idea on how git works. Also note that unless you see a git push command in that article, everything is done on your local copy of the repository. On Tue, Mar 12, 2013 at 8:41 PM, Erik de Bruin e...@ixsoftware.nl wrote: Thank you, I needed kittens! EdB On Tue, Mar 12, 2013 at 8:21 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin e...@ixsoftware.nl wrote: It does make me feel a little better, all this ranting. And bite the bullet and move on is only possible if the people that actually know git actively help out the many active contributors that are complete newbies at it. One of the first things I like to see is an actual step-by-step in the Wiki that lists and explains all the commands we need to use if we want our code to move from our machines to somewhere where it is integrated and available to everyone else. If possible, it also explains where this 'somewhere' is and how you can keep your local code up to date with it (without having to worry you're on a different branch/fork/hub than most other people). Still confused, EdB PS. This will be my last rant on this subject, I'll kick the dog if I need to feel better from here on out. As you can see, we are working to get all this done. In the meantime, watch these kittens playing: http://www.youtube.com/watch?v=-efQuSlxgWY This is the best I can do for you now :-) Om On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Yennick, Thank you! I was already aware of that workflow. In fact, it IS the branching model Apache Flex will be using. It was voted in as the preferred way to work with git after the switch from SVN. EdB On Wed, Mar 13, 2013 at 8:54 AM, Yennick Trevels yennick.trev...@gmail.com wrote: Erik, Here's an example of how a git workflow can look like: http://nvie.com/posts/a-successful-git-branching-model/ While this is not necessarily the branching model that the Apache Flex project will use, it should give you a better idea on how git works. Also note that unless you see a git push command in that article, everything is done on your local copy of the repository. On Tue, Mar 12, 2013 at 8:41 PM, Erik de Bruin e...@ixsoftware.nl wrote: Thank you, I needed kittens! EdB On Tue, Mar 12, 2013 at 8:21 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin e...@ixsoftware.nl wrote: It does make me feel a little better, all this ranting. And bite the bullet and move on is only possible if the people that actually know git actively help out the many active contributors that are complete newbies at it. One of the first things I like to see is an actual step-by-step in the Wiki that lists and explains all the commands we need to use if we want our code to move from our machines to somewhere where it is integrated and available to everyone else. If possible, it also explains where this 'somewhere' is and how you can keep your local code up to date with it (without having to worry you're on a different branch/fork/hub than most other people). Still confused, EdB PS. This will be my last rant on this subject, I'll kick the dog if I need to feel better from here on out. As you can see, we are working to get all this done. In the meantime, watch these kittens playing: http://www.youtube.com/watch?v=-efQuSlxgWY This is the best I can do for you now :-) Om On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Some more links for reference. The link to the [VOTE] email on using git and branching model: http://markmail.org/message/2kklqltsdo4643lv And the link to the [RESULT][VOTE] email: http://markmail.org/message/ajlskznzec4wqda2 EdB On Wed, Mar 13, 2013 at 9:29 AM, Erik de Bruin e...@ixsoftware.nl wrote: Yennick, Thank you! I was already aware of that workflow. In fact, it IS the branching model Apache Flex will be using. It was voted in as the preferred way to work with git after the switch from SVN. EdB On Wed, Mar 13, 2013 at 8:54 AM, Yennick Trevels yennick.trev...@gmail.com wrote: Erik, Here's an example of how a git workflow can look like: http://nvie.com/posts/a-successful-git-branching-model/ While this is not necessarily the branching model that the Apache Flex project will use, it should give you a better idea on how git works. Also note that unless you see a git push command in that article, everything is done on your local copy of the repository. On Tue, Mar 12, 2013 at 8:41 PM, Erik de Bruin e...@ixsoftware.nl wrote: Thank you, I needed kittens! EdB On Tue, Mar 12, 2013 at 8:21 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin e...@ixsoftware.nl wrote: It does make me feel a little better, all this ranting. And bite the bullet and move on is only possible if the people that actually know git actively help out the many active contributors that are complete newbies at it. One of the first things I like to see is an actual step-by-step in the Wiki that lists and explains all the commands we need to use if we want our code to move from our machines to somewhere where it is integrated and available to everyone else. If possible, it also explains where this 'somewhere' is and how you can keep your local code up to date with it (without having to worry you're on a different branch/fork/hub than most other people). Still confused, EdB PS. This will be my last rant on this subject, I'll kick the dog if I need to feel better from here on out. As you can see, we are working to get all this done. In the meantime, watch these kittens playing: http://www.youtube.com/watch?v=-efQuSlxgWY This is the best I can do for you now :-) Om On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: TLF Issue (was Re: SVN to Git migration in progress)
BTW, are these separate repos as far as Git is concerned or something else?) Humm..Can you reformulate that pls ? :P The only way I see if we don't want to use links is to use submodules but to use TLF as a submodule, it's root should be its sub directory textLayout so is that what we want ? -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 8:11 PM To: dev@flex.apache.org Subject: Re: TLF Issue (was Re: SVN to Git migration in progress) I think we don't want to use hard-links. And if submodules won't work, then I think it is time to figure out how to cut releases by grabbing stuff from different repos. (BTW, are these separate repos as far as Git is concerned or something else?) At Adobe, TLF was developed in Perforce by another team and we took drops for Flex. I'm sure we can do something similar. On 3/12/13 11:37 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
Huh? Does that mean we're back to square one with the migration? If yes, I'll do a svn checkout. I was waiting until this whole migration thing finishes to learn git… What a mess… ;-) On Mar 13, 2013, at 2:34 PM, Frédéric THOMAS wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex
Re: SVN to Git migration in progress
Huh? Does that mean we're back to square one with the migration? Yep :P -Fred -Message d'origine- From: Harbs Sent: Wednesday, March 13, 2013 2:15 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Huh? Does that mean we're back to square one with the migration? If yes, I'll do a svn checkout. I was waiting until this whole migration thing finishes to learn git… What a mess… ;-) On Mar 13, 2013, at 2:34 PM, Frédéric THOMAS wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration
Re: SVN to Git migration in progress
WTF! EdB On Wed, Mar 13, 2013 at 2:20 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Huh? Does that mean we're back to square one with the migration? Yep :P -Fred -Message d'origine- From: Harbs Sent: Wednesday, March 13, 2013 2:15 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Huh? Does that mean we're back to square one with the migration? If yes, I'll do a svn checkout. I was waiting until this whole migration thing finishes to learn git… What a mess… ;-) On Mar 13, 2013, at 2:34 PM, Frédéric THOMAS wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone
Re: SVN to Git migration in progress
Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy
Re: SVN to Git migration in progress
Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex
Re: SVN to Git migration in progress
There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try
Re: SVN to Git migration in progress
Well, shouldn't there have been some kind of discussion first, before such a drastic step as this is taken? We just learned from Bertrand that there are no Dictators in Apache.org, but the way INFRA is behaving, it seems like he was wrong. I propose that from now on all major actions wrt. git are discussed on the list first and then decided with either a [VOTE] or [LAZY]. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? EdB On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e
Re: SVN to Git migration in progress
It's not the best workflow I ever seen, for sure but given we're stuck on it, it's better to let it continue 'till the end, it doesn't serve us to slow it down at this point. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? NO or that's gonna be lost. DON'T DO ANYTHING (learn git in between or watch kitten video). -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:42 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Well, shouldn't there have been some kind of discussion first, before such a drastic step as this is taken? We just learned from Bertrand that there are no Dictators in Apache.org, but the way INFRA is behaving, it seems like he was wrong. I propose that from now on all major actions wrt. git are discussed on the list first and then decided with either a [VOTE] or [LAZY]. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? EdB On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only
Re: SVN to Git migration in progress
I HAVE been learning git. I have been migrating from SVN to git and while ranting on the list I've been learning on the job. I have git all set up and running and all the Falcon projects are 'checked out', set up and compiling again. I also moved all my uncommitted changes from SVN to git. There are now 8 major and 4 minor 'commits' ready to be 'pushed' to whatever branch they are intended to end up on (feature?, develop?, release?, master?). This has been a lot of work... And now you're telling me that without discussion or even notice, INFRA has decided to waste some more of my time by undoing the entire effort? Nice! EdB On Wed, Mar 13, 2013 at 2:49 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: It's not the best workflow I ever seen, for sure but given we're stuck on it, it's better to let it continue 'till the end, it doesn't serve us to slow it down at this point. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? NO or that's gonna be lost. DON'T DO ANYTHING (learn git in between or watch kitten video). -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:42 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Well, shouldn't there have been some kind of discussion first, before such a drastic step as this is taken? We just learned from Bertrand that there are no Dictators in Apache.org, but the way INFRA is behaving, it seems like he was wrong. I propose that from now on all major actions wrt. git are discussed on the list first and then decided with either a [VOTE] or [LAZY]. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? EdB On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12
Re: SVN to Git migration in progress
I didn't start to code anything knowing we're in the middle of a migration process but no worries, normaly, even if they generate another git repo, the SHA1 of the git objects gonna be the same, it means, you can do a patch with your change and re-apply it later, when git will r/w. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 3:03 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress I HAVE been learning git. I have been migrating from SVN to git and while ranting on the list I've been learning on the job. I have git all set up and running and all the Falcon projects are 'checked out', set up and compiling again. I also moved all my uncommitted changes from SVN to git. There are now 8 major and 4 minor 'commits' ready to be 'pushed' to whatever branch they are intended to end up on (feature?, develop?, release?, master?). This has been a lot of work... And now you're telling me that without discussion or even notice, INFRA has decided to waste some more of my time by undoing the entire effort? Nice! EdB On Wed, Mar 13, 2013 at 2:49 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: It's not the best workflow I ever seen, for sure but given we're stuck on it, it's better to let it continue 'till the end, it doesn't serve us to slow it down at this point. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? NO or that's gonna be lost. DON'T DO ANYTHING (learn git in between or watch kitten video). -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:42 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Well, shouldn't there have been some kind of discussion first, before such a drastic step as this is taken? We just learned from Bertrand that there are no Dictators in Apache.org, but the way INFRA is behaving, it seems like he was wrong. I propose that from now on all major actions wrt. git are discussed on the list first and then decided with either a [VOTE] or [LAZY]. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? EdB On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress Well in our case this would simply could be any committer of the project. At the time of me writing that article Velo was the only person with commit rights to the central repo :-) Von: Gordon Smith [gosm...@adobe.com] Gesendet: Dienstag, 12. März 2013 18:32 An: dev@flex.apache.org Betreff: RE: SVN to Git migration in progress What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now
Re: SVN to Git migration in progress
So I need to prepare patches for the commits that are currently ready to go in my local repo/branch, which I can apply when all is said and done and I have (again) cloned a new local copy and got that working? And just FYI, I didn't START to code anything, I was actually very close to committing what I had already written, which is why I was so frustrated in the first place that INFRA (without notification) made SVN read only... EdB On Wed, Mar 13, 2013 at 3:15 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I didn't start to code anything knowing we're in the middle of a migration process but no worries, normaly, even if they generate another git repo, the SHA1 of the git objects gonna be the same, it means, you can do a patch with your change and re-apply it later, when git will r/w. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 3:03 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress I HAVE been learning git. I have been migrating from SVN to git and while ranting on the list I've been learning on the job. I have git all set up and running and all the Falcon projects are 'checked out', set up and compiling again. I also moved all my uncommitted changes from SVN to git. There are now 8 major and 4 minor 'commits' ready to be 'pushed' to whatever branch they are intended to end up on (feature?, develop?, release?, master?). This has been a lot of work... And now you're telling me that without discussion or even notice, INFRA has decided to waste some more of my time by undoing the entire effort? Nice! EdB On Wed, Mar 13, 2013 at 2:49 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: It's not the best workflow I ever seen, for sure but given we're stuck on it, it's better to let it continue 'till the end, it doesn't serve us to slow it down at this point. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? NO or that's gonna be lost. DON'T DO ANYTHING (learn git in between or watch kitten video). -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:42 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Well, shouldn't there have been some kind of discussion first, before such a drastic step as this is taken? We just learned from Bertrand that there are no Dictators in Apache.org, but the way INFRA is behaving, it seems like he was wrong. I propose that from now on all major actions wrt. git are discussed on the list first and then decided with either a [VOTE] or [LAZY]. Now, to be clear: we now can write to SVN again, and all commits should go to SVN? EdB On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: There're some issues relative to the history of the develop branch of the flex-sdk git and the master of the utilities git, it can't be resolved w/o to do the all process again. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:27 PM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Before I totally freak out, please explain to me what just happened? Why did INFRA abort the migration? EdB On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Hi Erik, Yes, we're going to do the all process again until everything is ok. You shouldn't start working on git until this point (we're all locked at the moment), in between, you can do a patch, that should be easy to re-apply against the final version. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 2:18 PM To: dev@flex.apache.org Subject: Re: AW: SVN to Git migration in progress What does that mean? I have spent 2 days moving from SVN to git. Right now my entrire FlexJS MXML in FalconJx contribution is in git. Does this message mean that we go back to SVN? What does that mean for the work I already did in git, will I have to do the whole setup over again? If true, I'll go back to ranting... and no kittens will stop me this time! EdB On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Just an update from the infra [1] : danielsh_ Fine, I've made your svn space rw again. That does mean we'll have to do the make ro, create git repo, review it, make rw dance from the start sometime later. I suppose we can't commit in between ? danielsh_ The critical section is that the git repo must receive no commits while the PMC audits it. And that's usually accompanied by freezing svn (except site) to avoid a split brain condition. IOW if you commit to svn, git won't have those commits when made writable. -Fred [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070 -Message d'origine- From: christofer.d...@c-ware.de Sent: Wednesday, March 13, 2013 12:32 PM To: dev
Re: SVN to Git migration in progress
Will we still get commit emails? EdB On Tue, Mar 12, 2013 at 1:11 AM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: Hi, David migrate almost everything :) * Website will continue in SVN (as we already known) * If we want Whiteboards, we can ask for migration too or make it live along with site in SVN. As I'm not a fan of whiteboards, maybe others could say if they want in Git or not. I will prefer to live in SVN. * Flex PMC must look at the repos and confirm that all is ok to update the ticket and make it writable. We are very near to make this real :) Best, Carlos 2013/3/12 Carlos Rovira carlos.rov...@codeoscopic.com Hi, probably you already know, but I want to point that David Nalley is pushing this ticket forward ( https://issues.apache.org/jira/browse/INFRA-5549) He alert us that he will make the SVN repository read-only in the process, so take this into account. So it seems it is finally happening, can't believe it! yup! :) -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
He alert us that he will make the SVN repository read-only in the process, so take this into account. This has me very scared: I have a very large commit lined up for FalconJx (FlexJS integration) that I won't have ready for another couple of days. I have no experience with Git whatsoever. How can we prevent my contribution from being lost if I can't commit it to SVN? EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Hi, This has me very scared: I have a very large commit lined up for FalconJx (FlexJS integration) that I won't have ready for another couple of days. I have no experience with Git whatsoever. How can we prevent my contribution from being lost if I can't commit it to SVN? Create a patch and we can apply that to git. Justin
Re: SVN to Git migration in progress
Hi, Will we still get commit emails? I assume so - currently it's ready only so we can't test a commit. Justin
Re: SVN to Git migration in progress
Hi, It is mentioned the witheboards are moved on demand but mine is already readOnly :P -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 7:30 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress He alert us that he will make the SVN repository read-only in the process, so take this into account. This has me very scared: I have a very large commit lined up for FalconJx (FlexJS integration) that I won't have ready for another couple of days. I have no experience with Git whatsoever. How can we prevent my contribution from being lost if I can't commit it to SVN? EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
HI, It is mentioned the witheboards are moved on demand but mine is already readOnly :P I think all of SVN is currently read only. I'd also assume that it all whiteboards in GIt or SVN not each persons choice. Justin
Re: SVN to Git migration in progress
Yes, I just read it again, I need to read at least twice in English to get almost everything :P Thanks Justin, -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 7:56 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress HI, It is mentioned the witheboards are moved on demand but mine is already readOnly :P I think all of SVN is currently read only. I'd also assume that it all whiteboards in GIt or SVN not each persons choice. Justin
Re: SVN to Git migration in progress
Hi, Look like flex SDK has an issue with the TLF link - not sure how to fix this. /Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/compile-config.xml(58): Error: unable to open '/Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/3.0.33/manifest.xml' Justin
Re: SVN to Git migration in progress
On Mar 11, 2013 11:31 PM, Erik de Bruin e...@ixsoftware.nl wrote: He alert us that he will make the SVN repository read-only in the process, so take this into account. This has me very scared: I have a very large commit lined up for FalconJx (FlexJS integration) that I won't have ready for another couple of days. I have no experience with Git whatsoever. How can we prevent my contribution from being lost if I can't commit it to SVN? EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl Back-the-hell-up everything before trying anything going forward :-) Create a patch in svn, and apply it on to your new git repo directory. The format should be interchangeable. Thanks, Om
Re: SVN to Git migration in progress
Hi Erik, We're almost all at the same point, we're in the middle of a release :P Patience ! -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 7:58 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress I am not pleased at all. This is causing me all kinds of troubles and delays. What about a couple of days heads up, or even a vote on WHEN this will take place? EdB On Tue, Mar 12, 2013 at 7:42 AM, Justin Mclean jus...@classsoftware.com wrote: Hi, This has me very scared: I have a very large commit lined up for FalconJx (FlexJS integration) that I won't have ready for another couple of days. I have no experience with Git whatsoever. How can we prevent my contribution from being lost if I can't commit it to SVN? Create a patch and we can apply that to git. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Hi, What about a couple of days heads up, or even a vote on WHEN this will take place? Vote was 6 month ago but we held off doing it until we became a top level project. We ask infra about a month ago to look at it again and they decide to do it now. Given how long we've been waiting for this we should just try to sort it out. I think it would of caused some issues no matter when it happened. Thanks, Justin
Re: SVN to Git migration in progress
I think it would of caused some issues no matter when it happened. Some, yes, but not on this scale. Turns out my contribution is now in limbo until I can rearrange my workflow to allow for git and I actually learn git. Which means I now need to spend extra resources on something that was close to commit and would have travelled with the move to git. If we planned this (or at least were given notice!), we could have taken a couple of days to allow all outstanding commits to land, finalize all releases in progress and then move ahead with the move. The way its being handled now feels kinda like sabotage by Infra because they were tired with being hassled about this ticket. I really hope this move will bring the tons and tons of contributions and contributors that we've been promised by the proponents of this useless move, but I'm afraid it will be business as usual and all this will have achieved is wasting resources and delay the project. EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
HI, Look like flex SDK has an issue with the TLF link - not sure how to fix this. /Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/compile-config.xml(58): Error: unable to open '/Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/3.0.33/manifest.xml' Well no idea idea how to fix this. you can use submodules if it was the root directory of a repo eg git submodule add https://git-wip-us.apache.org/repos/asf/flex-tlf.git ./frameworks/projects/textLayout/3.0.33 However we need the textLayout directory of flex-tlf.git to link to ./frameworks/projects/textLayout/3.0.33 and as far as I know that's not possible under git. Anyone with more git experience than me have any suggestions? Thanks, Justin
Re: SVN to Git migration in progress
Well, not all PMCs are from the US, fortunately ;-) I did see that from the JIRA ticket it looks like INFRA missed a couple of repos as well (asjs and external)... EdB On Tue, Mar 12, 2013 at 8:46 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Well, I guess we're stuck for at least 24h, I guess the PMCs are all in a time zone where it's late now and not even sure David from the Infra is in the same time zone, so I'll check time to time to see what happens (except if you tell me if/how I can help). -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 8:04 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, What about a couple of days heads up, or even a vote on WHEN this will take place? Vote was 6 month ago but we held off doing it until we became a top level project. We ask infra about a month ago to look at it again and they decide to do it now. Given how long we've been waiting for this we should just try to sort it out. I think it would of caused some issues no matter when it happened. Thanks, Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Justin, Did you have a look at [1], not sure it fits as 'updating the external from SVN is unfortunately a tedious three-step process' but it's all I found, googling again... -Fred [1] http://fredericiana.com/2010/01/12/using-svn-repositories-as-git-submodules/ -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 8:48 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress HI, Look like flex SDK has an issue with the TLF link - not sure how to fix this. /Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/compile-config.xml(58): Error: unable to open '/Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/3.0.33/manifest.xml' Well no idea idea how to fix this. you can use submodules if it was the root directory of a repo eg git submodule add https://git-wip-us.apache.org/repos/asf/flex-tlf.git ./frameworks/projects/textLayout/3.0.33 However we need the textLayout directory of flex-tlf.git to link to ./frameworks/projects/textLayout/3.0.33 and as far as I know that's not possible under git. Anyone with more git experience than me have any suggestions? Thanks, Justin
Re: SVN to Git migration in progress
Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? -Fred -Message d'origine- From: Frédéric THOMAS Sent: Tuesday, March 12, 2013 9:01 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Justin, Did you have a look at [1], not sure it fits as 'updating the external from SVN is unfortunately a tedious three-step process' but it's all I found, googling again... -Fred [1] http://fredericiana.com/2010/01/12/using-svn-repositories-as-git-submodules/ -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 8:48 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress HI, Look like flex SDK has an issue with the TLF link - not sure how to fix this. /Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/compile-config.xml(58): Error: unable to open '/Users/justinmclean/Documents/ApacheFlexDevelopGit/frameworks/projects/textLayout/3.0.33/manifest.xml' Well no idea idea how to fix this. you can use submodules if it was the root directory of a repo eg git submodule add https://git-wip-us.apache.org/repos/asf/flex-tlf.git ./frameworks/projects/textLayout/3.0.33 However we need the textLayout directory of flex-tlf.git to link to ./frameworks/projects/textLayout/3.0.33 and as far as I know that's not possible under git. Anyone with more git experience than me have any suggestions? Thanks, Justin
Re: SVN to Git migration in progress
Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin
Re: SVN to Git migration in progress
Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Ok, I think I see, the textLayout repo hasn't been added as a module to the remote master, and I guess we haven't got the option to do localy and push it because we're remotly readonly -Message d'origine- From: Frédéric THOMAS Sent: Tuesday, March 12, 2013 9:16 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin
Re: SVN to Git migration in progress
it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Hi, https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? If you check it out you will get trunk (or rather master). To check out do a git checkout https://git-wip-us.apache.org/repos/asf/flex-sdk.git To switch to develop you need to make a local branch that mirrors the remote develop branch like so: git checkout --track -b develop origin/develop Then to switch (if you need) you just do a: git checkout master git checkout develop (probably other ways as well) To show branches you can: git branch To show status you can: git status (which will also show what branch you are in) To update do: git pull To commit do a: git commit This will commit the files locally and not push the changes back to the Apache git server. To push changes back to the Apache git server git push Hope that helps, Justin
Re: SVN to Git migration in progress
Hi, I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 That's the trunk. A git clone will get trunk or master by default if you just pass it the git repo URL. While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 See my previous email on how to switch to develop and/or switch between branches. Justin
Re: SVN to Git migration in progress
Hi, Also, shouldn't this be in the Wiki? Yep. Someone was working on it - no idea how far they got or where it is on the wiki. IMO the vote was taken without thought to what the real implication may be, but that's the community wanted. I call on all of the committers who voted +1 to step forward and help out with the transition. Justin
Re: SVN to Git migration in progress
https://cwiki.apache.org/confluence/display/FLEX/Git+Guide I'd say not all relevant practical is there... it's more like a brief RTFM and figure it out yourself entry. An urgent +1 on making this a proper HOWTO. EdB On Tue, Mar 12, 2013 at 10:32 AM, Justin Mclean jus...@classsoftware.com wrote: Hi, Also, shouldn't this be in the Wiki? Yep. Someone was working on it - no idea how far they got or where it is on the wiki. IMO the vote was taken without thought to what the real implication may be, but that's the community wanted. I call on all of the committers who voted +1 to step forward and help out with the transition. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Unfortunaly, I haven't the rights, the repo is read only. -Fred -Message d'origine- From: Frédéric THOMAS Sent: Tuesday, March 12, 2013 10:46 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Well, I prefer a git clone to be able to quickly switch branch. I localy have been able to add tlf as submodule, not sure I've got the karma to push it, I'm going to try. -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 10:32 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Also, shouldn't this be in the Wiki? Yep. Someone was working on it - no idea how far they got or where it is on the wiki. IMO the vote was taken without thought to what the real implication may be, but that's the community wanted. I call on all of the committers who voted +1 to step forward and help out with the transition. Justin
Re: SVN to Git migration in progress
I'm just about to, I move my repo first, set my env files, build and keep yo in touch -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 10:55 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, I localy have been able to add tlf as submodule, not sure I've got the karma to push it, I'm going to try. You can add it as a sub model but the paths are incorrect - have you tried an to build the SDK? Justin
Re: SVN to Git migration in progress
I just tried to build the SDK ('develop' branch) in preparation to
building Falcon and FalconJx (to get some work done on the whole
patch thing I apparently have to do now) and also got the TLF
manifest error...
Nobody tried to build the SDK from a git SVN clone before voting +1 on
the move? Excellent!
EdB
On Tue, Mar 12, 2013 at 10:55 AM, Justin Mclean
jus...@classsoftware.com wrote:
Hi,
I localy have been able to add tlf as submodule, not sure I've got the karma
to push it, I'm going to try.
You can add it as a sub model but the paths are incorrect - have you tried an
to build the SDK?
Justin
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: SVN to Git migration in progress
It gonna a take some time as I do it regulary with ant thirdparty-downloads before -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 10:55 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, I localy have been able to add tlf as submodule, not sure I've got the karma to push it, I'm going to try. You can add it as a sub model but the paths are incorrect - have you tried an to build the SDK? Justin
Re: SVN to Git migration in progress
Note: It's the past but I wasn't for git, I proposed sub-git which is a
tools that allows to work either with git and svn
-Message d'origine-
From: Erik de Bruin
Sent: Tuesday, March 12, 2013 10:58 AM
To: dev@flex.apache.org
Subject: Re: SVN to Git migration in progress
I just tried to build the SDK ('develop' branch) in preparation to
building Falcon and FalconJx (to get some work done on the whole
patch thing I apparently have to do now) and also got the TLF
manifest error...
Nobody tried to build the SDK from a git SVN clone before voting +1 on
the move? Excellent!
EdB
On Tue, Mar 12, 2013 at 10:55 AM, Justin Mclean
jus...@classsoftware.com wrote:
Hi,
I localy have been able to add tlf as submodule, not sure I've got the
karma to push it, I'm going to try.
You can add it as a sub model but the paths are incorrect - have you tried
an to build the SDK?
Justin
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: SVN to Git migration in progress
From what I see of the directory structure I have, I haven't even to build
it to realize the root of the TLF is one level too high and as you said it
won't match what we need.
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, March 12, 2013 11:14 AM
To: dev@flex.apache.org
Subject: Re: SVN to Git migration in progress
Hi,
I just tried to build the SDK ('develop' branch) in preparation to
building Falcon and FalconJx (to get some work done on the whole
patch thing I apparently have to do now) and also got the TLF
manifest error...
You can check out the TLF into another directory and create a soft link to
it. It's a work around for now but it does work.
mkdir ApacheFlexTLFGit
cd ApacheFlexTLFGit
git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git .
cd ../ApacheFlexDevelopGit/frameworks/projects/textLayout/
ln -s ../../../../ApacheFlexTLFGit/textLayout 3.0.33
Nobody tried to build the SDK from a git SVN clone before voting +1 on
the move? Excellent!
That would be far too sensible :-)
Justin
Re: SVN to Git migration in progress
I second that, I just successfully built the SDK as well, using Justin's workaround for the TLF issue. EdB On Tue, Mar 12, 2013 at 11:26 AM, Justin Mclean jus...@classsoftware.com wrote: Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin
Re: SVN to Git migration in progress
Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- João Fernandes
Re: SVN to Git migration in progress
Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- João Fernandes -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- João Fernandes -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es
Re: SVN to Git migration in progress
Well, I've been able to build the SDK, on windows, I had to find a way to create a hard link to the TLF git repo textLayout sub directory as you did (It means we'll have to update the readme to explain the users how to do that, not obvious). I haven't been able to apply the patch, probably because I haven't got the same root, with SVN, I didn't checked out from utilities but directly from Installer and when I tried to apply the patch toirtoiseSVN spit out something about a bad revision number, well, happily, I haven't got a lot and I'll be able to do it manualy. Note: Given not everybody knows git, I hope at least they will do pull -rebase and not only pull to keep the commits in the right order otherwise that's going to be rapidly the mess. -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin
Re: SVN to Git migration in progress
Erik, I'm no git guru but, the great thing about git is its cheap branches. You will be pushing your changes but, you will be pushing a branch that is not the master. Once you have pushed that experimental branch, I can switch to that branch which changes my local files to mirror yours, then I can see if there are confilcits. I can merge my commits into your branch. Once that branch is on a working level, we can then merge your branch into master. I know this is confusing and I will admit I have not worked on a large project like this in git but, I do kind of understand why the git branching is superior to svn. Don't worry about mishaps, I will make them to, we will figure it out. Calros, if I made a mistake in this description, please amend my statements with facts. :) Mike Quoting Erik de Bruin e...@ixsoftware.nl: What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- João Fernandes -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Michael Schmalle - Teoti Graphix, LLC http://www.teotigraphix.com http://blog.teotigraphix.com
Re: SVN to Git migration in progress
It seems to me that all it does is add an extra layer Yes indeed. And that's a good thing, because it allows you to commit often and very granularly. I read that you were preparing everything for a committing one big change to Subversion. The Git workflow is a bit different. In Git you would: - create a branch for your new feature - commit often (e.g. you fixed that nullpointer that you forgot to check for commit; you updated some docs commit; etc.) - when the code is ready for your teammates to chime in, you push the branch (most of the time with multiple commits) - when the feature is ready, you merge the feature branch into the 'dev' branch and push that In Subversion you cannot commit until your code is ready to share. In Git you can. This granular way of comitting allows you to better dig through the logs later on; roll back possible small mistakes; merge only small fixes; etc. You can even select specific lines in a file to commit. As a side effect because all the branching and committing happens locally, everything happens a thousand times faster than with Subversion. Especially with a large code-bases like Flex'. I wouldn't even want to think about creating a feature branch for the Apache Flex repo in Subversion. But in Git I would. Max
RE: SVN to Git migration in progress
Erik, What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... It will seem that way at first. Don't expect your first couple of weeks to be happy, but I promise it gets better. The big advantage is having local branching, roll back, staging and the ability to work completely offline. The thing is that it's a totally different workflow so it's hard to compare git versus svn accurately. My git workflow is constant committing and branching locally (all of which are nearly 0 overhead in git). It allows me to task switch very easily, to try things out and roll back when they don't work. I can be in the middle of a task, stash the half-baked code, switch over to do a bug fix, and then switch back and resume my state. I make potentially dozens if not hundreds of branches in the course of a day when I am really coding. Out of all of those branches and commits, I perhaps push 1 or 2 up to the outside world. Its more about local code organization and local workspace management and then sharing the daily or hourly results of those efforts. I can promise this will suck for you at first. You are asking all of the question I did and I frankly hated git and was frustrated with it for weeks. Now I strongly dislike when someone makes me use SVN. It feels clunky and inelegant. Mike
Re: SVN to Git migration in progress
Hi, What advantage is having a local repo to having a local working copy? Also means you can commit when you don't have an internet connection. Justin
Re: SVN to Git migration in progress
HI, What advantage is having a local repo to having a local working copy? Means you can commit a lot more often in small bite size chunks locally. Makes it easier to revert minor changes locally for one. As the cost of branching and committing is less in Git than SVN (it's local) you can do it more often. You then have the decision of pushing/merging with --no-ff or not. By default each commit is copied across, with --no-ff all changes are committed/pushed under a single comment. Gifflow suggests --no-ff but I think it depends on how often you commit, what you're working on and if each commit comment would be useful to everyone. And I've probably just added to your confusion :-) Justin
TLF Issue (was Re: SVN to Git migration in progress)
Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
RE: SVN to Git migration in progress
What happens here is that you commit to a publically accessible repository clone on GitHub that only you can commit to and then issue a Pull Request to Velo. He can now review your changes and pull these changes from your private fork at GitHub. If he likes what you did, he will apply your patches to the trunk and you're done. Who is going to be the Velo for Apache Flex? That person is going to be very busy! - Gordon -Original Message- From: christofer.d...@c-ware.de [mailto:christofer.d...@c-ware.de] Sent: Tuesday, March 12, 2013 9:00 AM To: dev@flex.apache.org Subject: AW: SVN to Git migration in progress I once wrote up the workflow of contributing to Flexmojos using Git ... as the workflow for Flex is now the same, perhaps it explains a little and helps clear the confusion with git: https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos Chris Von: Erik de Bruin [e...@ixsoftware.nl] Gesendet: Dienstag, 12. März 2013 13:08 An: dev@flex.apache.org Betreff: Re: SVN to Git migration in progress What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... EdB On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira carlos.rov...@codeoscopic.com wrote: commit is like SVN, you are making a commit in your *local* repo. When GIT will became RW, you will be able to push to the remote repo sharing your changes. In Git you have a fully functional local repo, and there's a shared one remotely while in SVN there's only one remotely... 2013/3/12 Erik de Bruin e...@ixsoftware.nl Joao, Thank you... but that went right over my head. I'm still at the stage where I'm trying to grok the difference between 'commit' and 'push'... I'll get there, but I'm so not pleased with (the timing) of this move that you all get to enjoy my wining about it until I have the FalconJx stuff - which I had nicely lined up for a SVN commit - working again in the new git repos I've been forced to make, and my code is safely 'staged/committed/pushed' for all to enjoy. EdB On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes joaopedromartinsfernan...@gmail.com wrote: Eric, If you want to learn the basics behind git you can try http://pcottle.github.com/learnGitBranching/ , it helped me. On 12 March 2013 09:14, Erik de Bruin e...@ixsoftware.nl wrote: Are you sure? I did a 'git clone' and 'build.properties' shows: # flex-sdk-description values release = Apache Flex 4.9.1 release.version = 4.9.1 While the develop branch in SVN has: # flex-sdk-description values release = Apache Flex 4.10.0 release.version = 4.10.0 Oops? EdB On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: it contains a copy of the develop branch you should do: git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create a new directory called flex-sdk, if you prefer 'develop' append ' develop' to the clone command -Fred -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 9:40 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Just trying to understand what just happened: https://git-wip-us.apache.org/repos/asf/flex-sdk.git Does that contain a copy of 'trunk' or of 'branches/develop'? EdB On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: I'm currently cloning the repo to see how it has been done... -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 9:11 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Hey, textLayout is converted to git too, so a git submodule init and then git submodule update should do the trick, non ? No because we need a subdirectory of the textLayout git repo. Justin -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- João Fernandes -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
RE: SVN to Git migration in progress
Sorry, this kind of description makes no sense to people who are new to Git like me and don't understand how multiple copies of the entire repository get used. For example, when you say Create a branch for your new feature, what repository am I creating a branch in? The master repo? (Is that on an Apache server or on a server at GitHub?) My local copy of the repo? The copy of the repo that another email said I'm supposed to make on the server? Commit often. To which repo? Push the branch. Within one of the three repos? Between one repo and another? Which ones? Merge the feature branch into the 'dev' branch Within one of the three repos? Between one repo and another? Which ones? - Gordon -Original Message- From: RIAstar [mailto:max...@riastar.net] Sent: Tuesday, March 12, 2013 5:52 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress It seems to me that all it does is add an extra layer Yes indeed. And that's a good thing, because it allows you to commit often and very granularly. I read that you were preparing everything for a committing one big change to Subversion. The Git workflow is a bit different. In Git you would: - create a branch for your new feature - commit often (e.g. you fixed that nullpointer that you forgot to check for commit; you updated some docs commit; etc.) - when the code is ready for your teammates to chime in, you push the branch (most of the time with multiple commits) - when the feature is ready, you merge the feature branch into the 'dev' branch and push that In Subversion you cannot commit until your code is ready to share. In Git you can. This granular way of comitting allows you to better dig through the logs later on; roll back possible small mistakes; merge only small fixes; etc. You can even select specific lines in a file to commit. As a side effect because all the branching and committing happens locally, everything happens a thousand times faster than with Subversion. Especially with a large code-bases like Flex'. I wouldn't even want to think about creating a feature branch for the Apache Flex repo in Subversion. But in Git I would. Max
Re: SVN to Git migration in progress
I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? EdB On Tue, Mar 12, 2013 at 3:50 PM, Michael A. Labriola labri...@digitalprimates.net wrote: Erik, What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... It will seem that way at first. Don't expect your first couple of weeks to be happy, but I promise it gets better. The big advantage is having local branching, roll back, staging and the ability to work completely offline. The thing is that it's a totally different workflow so it's hard to compare git versus svn accurately. My git workflow is constant committing and branching locally (all of which are nearly 0 overhead in git). It allows me to task switch very easily, to try things out and roll back when they don't work. I can be in the middle of a task, stash the half-baked code, switch over to do a bug fix, and then switch back and resume my state. I make potentially dozens if not hundreds of branches in the course of a day when I am really coding. Out of all of those branches and commits, I perhaps push 1 or 2 up to the outside world. Its more about local code organization and local workspace management and then sharing the daily or hourly results of those efforts. I can promise this will suck for you at first. You are asking all of the question I did and I frankly hated git and was frustrated with it for weeks. Now I strongly dislike when someone makes me use SVN. It feels clunky and inelegant. Mike -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: TLF Issue (was Re: SVN to Git migration in progress)
Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Who is this question directed towards? You should probably talk to INFRA about the timing. The Flex PMC has no control over when these things happen. The ticket was open for 6 months. We did have a few emails in the past few weeks about this impending migration [1], [2] Thanks, Om [1] http://markmail.org/message/vyzzbumvwfcyzey2 [2] http://markmail.org/message/h7licye6pw4qnrbv On Tue, Mar 12, 2013 at 3:50 PM, Michael A. Labriola labri...@digitalprimates.net wrote: Erik, What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... It will seem that way at first. Don't expect your first couple of weeks to be happy, but I promise it gets better. The big advantage is having local branching, roll back, staging and the ability to work completely offline. The thing is that it's a totally different workflow so it's hard to compare git versus svn accurately. My git workflow is constant committing and branching locally (all of which are nearly 0 overhead in git). It allows me to task switch very easily, to try things out and roll back when they don't work. I can be in the middle of a task, stash the half-baked code, switch over to do a bug fix, and then switch back and resume my state. I make potentially dozens if not hundreds of branches in the course of a day when I am really coding. Out of all of those branches and commits, I perhaps push 1 or 2 up to the outside world. Its more about local code organization and local workspace management and then sharing the daily or hourly results of those efforts. I can promise this will suck for you at first. You are asking all of the question I did and I frankly hated git and was frustrated with it for weeks. Now I strongly dislike when someone makes me use SVN. It feels clunky and inelegant. Mike -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
Om, Those emails hardly give a reliable time table... One of the reasons this sudden move frustrates me so endlessly is that I literally was ready to commit the FlexJS in FalconJx code this morning and move on to actual payed work. Instead I ended up spending my day trying to figure out git (and in the process be amazed by how many problems this will introduce and how few problems - if any - it will solve) and trying to prepare for my first commit/push/rebase/branch. I'll shut up now, as everyone else seems very happy with their new toy. EdB On Tue, Mar 12, 2013 at 7:37 PM, Om bigosma...@gmail.com wrote: And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Who is this question directed towards? You should probably talk to INFRA about the timing. The Flex PMC has no control over when these things happen. The ticket was open for 6 months. We did have a few emails in the past few weeks about this impending migration [1], [2] Thanks, Om [1] http://markmail.org/message/vyzzbumvwfcyzey2 [2] http://markmail.org/message/h7licye6pw4qnrbv On Tue, Mar 12, 2013 at 3:50 PM, Michael A. Labriola labri...@digitalprimates.net wrote: Erik, What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... It will seem that way at first. Don't expect your first couple of weeks to be happy, but I promise it gets better. The big advantage is having local branching, roll back, staging and the ability to work completely offline. The thing is that it's a totally different workflow so it's hard to compare git versus svn accurately. My git workflow is constant committing and branching locally (all of which are nearly 0 overhead in git). It allows me to task switch very easily, to try things out and roll back when they don't work. I can be in the middle of a task, stash the half-baked code, switch over to do a bug fix, and then switch back and resume my state. I make potentially dozens if not hundreds of branches in the course of a day when I am really coding. Out of all of those branches and commits, I perhaps push 1 or 2 up to the outside world. Its more about local code organization and local workspace management and then sharing the daily or hourly results of those efforts. I can promise this will suck for you at first. You are asking all of the question I did and I frankly hated git and was frustrated with it for weeks. Now I strongly dislike when someone makes me use SVN. It feels clunky and inelegant. Mike -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: SVN to Git migration in progress
On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
On Tue, Mar 12, 2013 at 12:00 PM, Erik de Bruin e...@ixsoftware.nl wrote: Om, Those emails hardly give a reliable time table... One of the reasons this sudden move frustrates me so endlessly is that I literally was ready to commit the FlexJS in FalconJx code this morning and move on to actual payed work. Instead I ended up spending my day trying to figure out git (and in the process be amazed by how many problems this will introduce and how few problems - if any - it will solve) and trying to prepare for my first commit/push/rebase/branch. I'll shut up now, as everyone else seems very happy with their new toy. EdB You think I am happy with the timing? We were in the middle of a frigging release! We have one RC out and we are stuck. This is one of the times we have to bite the bullet and move on. Complaing (too much ;-) ) will only suck more oxygen. All I want to do is finish the migration and move on. I am sure you want that as well. Thanks, Om On Tue, Mar 12, 2013 at 7:37 PM, Om bigosma...@gmail.com wrote: And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Who is this question directed towards? You should probably talk to INFRA about the timing. The Flex PMC has no control over when these things happen. The ticket was open for 6 months. We did have a few emails in the past few weeks about this impending migration [1], [2] Thanks, Om [1] http://markmail.org/message/vyzzbumvwfcyzey2 [2] http://markmail.org/message/h7licye6pw4qnrbv On Tue, Mar 12, 2013 at 3:50 PM, Michael A. Labriola labri...@digitalprimates.net wrote: Erik, What advantage is having a local repo to having a local working copy? It seems to me that all it does is add an extra layer between me and my co-contributors. I need to 'commit' to my local repo and then 'push' to get it out to the world, where before only a 'commit' was needed... It will seem that way at first. Don't expect your first couple of weeks to be happy, but I promise it gets better. The big advantage is having local branching, roll back, staging and the ability to work completely offline. The thing is that it's a totally different workflow so it's hard to compare git versus svn accurately. My git workflow is constant committing and branching locally (all of which are nearly 0 overhead in git). It allows me to task switch very easily, to try things out and roll back when they don't work. I can be in the middle of a task, stash the half-baked code, switch over to do a bug fix, and then switch back and resume my state. I make potentially dozens if not hundreds of branches in the course of a day when I am really coding. Out of all of those branches and commits, I perhaps push 1 or 2 up to the outside world. Its more about local code organization and local workspace management and then sharing the daily or hourly results of those efforts. I can promise this will suck for you at first. You are asking all of the question I did and I frankly hated git and was frustrated with it for weeks. Now I strongly dislike when someone makes me use SVN. It feels clunky and inelegant. Mike -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: TLF Issue (was Re: SVN to Git migration in progress)
I think we don't want to use hard-links. And if submodules won't work, then I think it is time to figure out how to cut releases by grabbing stuff from different repos. (BTW, are these separate repos as far as Git is concerned or something else?) At Adobe, TLF was developed in Perforce by another team and we took drops for Flex. I'm sure we can do something similar. On 3/12/13 11:37 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin e...@ixsoftware.nl wrote: It does make me feel a little better, all this ranting. And bite the bullet and move on is only possible if the people that actually know git actively help out the many active contributors that are complete newbies at it. One of the first things I like to see is an actual step-by-step in the Wiki that lists and explains all the commands we need to use if we want our code to move from our machines to somewhere where it is integrated and available to everyone else. If possible, it also explains where this 'somewhere' is and how you can keep your local code up to date with it (without having to worry you're on a different branch/fork/hub than most other people). Still confused, EdB PS. This will be my last rant on this subject, I'll kick the dog if I need to feel better from here on out. As you can see, we are working to get all this done. In the meantime, watch these kittens playing: http://www.youtube.com/watch?v=-efQuSlxgWY This is the best I can do for you now :-) Om On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: TLF Issue (was Re: SVN to Git migration in progress)
Why is TLF a separate repro at all? Why isn't it just part of the sdk repro? On Mar 12, 2013, at 9:11 PM, Alex Harui wrote: I think we don't want to use hard-links. And if submodules won't work, then I think it is time to figure out how to cut releases by grabbing stuff from different repos. (BTW, are these separate repos as far as Git is concerned or something else?) At Adobe, TLF was developed in Perforce by another team and we took drops for Flex. I'm sure we can do something similar. On 3/12/13 11:37 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Submodules in Git are less flexible than svn:externals and less straightforward to use, you can plug an entire git repo as submodule but can't plug a sub-directory the a git repo as submodule. The problem with TLF is we need to plug the sub-directory called textLayout to the 3.0.33 directory of our sdk repo, that's make submodules unusable. One way to go is to clone the TLF repo a part, make a hard link from the textLayout directory to a new 3.0.33 directory in the sdk repo, gitignore this directory at the sdk repo level, if we want to work on TLF, we can do it from the TLF repo itself. Note: - I've got this working and I finished to fill the .gitignore file. - On windows, there's a free software to manage soft/hard link, but it's one thing in more to do to setup the SDK that has to be explain in the readme. -Fred -Message d'origine- From: Alex Harui Sent: Tuesday, March 12, 2013 6:00 PM To: dev@flex.apache.org Subject: TLF Issue (was Re: SVN to Git migration in progress) Well, I'm still learning about Git, but it looks like we have to resolve the TLF svn:externals issue and it isn't clear that links in the file system are going to work on Windows and are the correct solution. Does anybody actually know the answer? Or do we just have to figure it out on our own. One thing I saw on the internet says that you can just pull from the other project if there aren't any conflicts with file names. Would that work? Were submodules and/or subtrees ruled out? It appeared from the Git manual that an update of the main project doesn't automatically update the submodules, so that will leave us open to making mistakes staying in sync. IMO, we should re-think why we had TLF as an svn:external. I think we just did it so the build scripts wouldn't have to change that much from the Adobe days, so we could find the source where we were used to seeing it. But looking not to far into the future, our releases may become a composition of stuff from the various Apache Flex sub-projects. For example, the FlexJS stuff is compositing things from the old Flex SDK, the Falcon project and the ASJS project. So, given that we might have sync issues in Git even with submodules, maybe the answer is to rework the release scripts to composite from multiple projects? -Alex On 3/12/13 3:59 AM, Frédéric THOMAS webdoubl...@hotmail.com wrote: Still that :) I guess on windows I should find a way to to a hard link, right ? -Fred -Message d'origine- From: Justin Mclean Sent: Tuesday, March 12, 2013 11:26 AM To: dev@flex.apache.org Subject: Re: SVN to Git migration in progress Hi, Well the good news is other than the flex-sdk git repo compiles a usable SDK if you work around the TLF issue. Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: SVN to Git migration in progress
Thank you, I needed kittens! EdB On Tue, Mar 12, 2013 at 8:21 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin e...@ixsoftware.nl wrote: It does make me feel a little better, all this ranting. And bite the bullet and move on is only possible if the people that actually know git actively help out the many active contributors that are complete newbies at it. One of the first things I like to see is an actual step-by-step in the Wiki that lists and explains all the commands we need to use if we want our code to move from our machines to somewhere where it is integrated and available to everyone else. If possible, it also explains where this 'somewhere' is and how you can keep your local code up to date with it (without having to worry you're on a different branch/fork/hub than most other people). Still confused, EdB PS. This will be my last rant on this subject, I'll kick the dog if I need to feel better from here on out. As you can see, we are working to get all this done. In the meantime, watch these kittens playing: http://www.youtube.com/watch?v=-efQuSlxgWY This is the best I can do for you now :-) Om On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 11:11 AM, Erik de Bruin e...@ixsoftware.nl wrote: I still don't see what problem this fixes. And having to work with something thats sucks for weeks while you're knee deep into a release/contribution is causing problems that weren't there. And more importantly: I don't see what this does for the project that needed to be done so desperately that we couldn't get a couple of days advance warning so we could at least commit our outstanding changes and finish the release(s) that were in progress? Erik, there is no question that the migration should have been delayed and better coordinated/communicated. Normally Infra checks with us before doing things like this. Either they forgot or someone besides us gave the go ahead. If it makes you feel better to keep ranting, fine, but I don't think it will cause us to reverse engines. I've never used Git, but everything I've read says it is a better implementation of SCM. I don't see complaints about Git like I do about SVN. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
Re: TLF Issue (was Re: SVN to Git migration in progress)
On 3/12/13 12:26 PM, Harbs harbs.li...@gmail.com wrote: Why is TLF a separate repro at all? Why isn't it just part of the sdk repro? Might be possible, but TLF came late and had its own set of branches and no SVN history so we kept it external. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: TLF Issue (was Re: SVN to Git migration in progress)
On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 12:26 PM, Harbs harbs.li...@gmail.com wrote: Why is TLF a separate repro at all? Why isn't it just part of the sdk repro? Might be possible, but TLF came late and had its own set of branches and no SVN history so we kept it external. I think we should just copy the TLF project into the appropriate directory path under the sdk. I dont see any value keeping it as separate top level project. And this is probably the best time to do this. Thanks, Om
Re: TLF Issue (was Re: SVN to Git migration in progress)
Hi, I think we should just copy the TLF project into the appropriate directory path under the sdk. I dont see any value keeping it as separate top level project. -1 to this the FLEX SDK uses a subdirectory of TLF not the root. Justin
Re: TLF Issue (was Re: SVN to Git migration in progress)
On 3/12/13 1:03 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 12:26 PM, Harbs harbs.li...@gmail.com wrote: Why is TLF a separate repro at all? Why isn't it just part of the sdk repro? Might be possible, but TLF came late and had its own set of branches and no SVN history so we kept it external. I think we should just copy the TLF project into the appropriate directory path under the sdk. I dont see any value keeping it as separate top level project. And this is probably the best time to do this. I think it is best if we learn to deal with external repos. When we make Falcon the default compiler, we won't copy it into SDK will we? And BlazeDS, and Squiggly, etc. TLF has no Flex SDK dependencies so it is probably best kept separate and available for those not using the main Flex SDK. It might even get used by FlexJS users, for example. -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
Re: TLF Issue (was Re: SVN to Git migration in progress)
On Tue, Mar 12, 2013 at 1:18 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 1:03 PM, Om bigosma...@gmail.com wrote: On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui aha...@adobe.com wrote: On 3/12/13 12:26 PM, Harbs harbs.li...@gmail.com wrote: Why is TLF a separate repro at all? Why isn't it just part of the sdk repro? Might be possible, but TLF came late and had its own set of branches and no SVN history so we kept it external. I think we should just copy the TLF project into the appropriate directory path under the sdk. I dont see any value keeping it as separate top level project. And this is probably the best time to do this. I think it is best if we learn to deal with external repos. When we make Falcon the default compiler, we won't copy it into SDK will we? And BlazeDS, and Squiggly, etc. I agree with the general principle about having to deal with externals. But I am not very sure what plans we have for TLF though. TLF has no Flex SDK dependencies so it is probably best kept separate and available for those not using the main Flex SDK. It might even get used by FlexJS users, for example. How will FlexJS use it? Isnt TLF based on Flash Text Engine? I thought the goal of FlexJS is to eliminate dependency on Flash? Thanks, Om
Re: TLF Issue (was Re: SVN to Git migration in progress)
Eventually, there will need to be a comparable text engine for JS. Having a single interface for Flash TLF and Javascript TLF could be valuable. On Mar 12, 2013, at 10:33 PM, Om wrote: TLF has no Flex SDK dependencies so it is probably best kept separate and available for those not using the main Flex SDK. It might even get used by FlexJS users, for example. How will FlexJS use it? Isnt TLF based on Flash Text Engine? I thought the goal of FlexJS is to eliminate dependency on Flash?
Re: SVN to Git migration in progress
Hi, David migrate almost everything :) * Website will continue in SVN (as we already known) * If we want Whiteboards, we can ask for migration too or make it live along with site in SVN. As I'm not a fan of whiteboards, maybe others could say if they want in Git or not. I will prefer to live in SVN. * Flex PMC must look at the repos and confirm that all is ok to update the ticket and make it writable. We are very near to make this real :) Best, Carlos 2013/3/12 Carlos Rovira carlos.rov...@codeoscopic.com Hi, probably you already know, but I want to point that David Nalley is pushing this ticket forward ( https://issues.apache.org/jira/browse/INFRA-5549) He alert us that he will make the SVN repository read-only in the process, so take this into account. So it seems it is finally happening, can't believe it! yup! :) -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es
