Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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 mentione

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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.

Re: SVN to Git migration in progress

2013-03-12 Thread Om
On Mar 11, 2013 11:31 PM, "Erik de Bruin" 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

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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 causi

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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 t

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
> 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 clos

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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-

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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/tex

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 wrote: > Well, I guess we're stuck for at least 24h, I guess the PMCs are al

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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---

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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

2013-03-12 Thread Frédéric THOMAS
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

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 wrote: > I'm currently cloning the repo to see how it has been done... > > -Fr

RE: Components donation

2013-03-12 Thread Jérémy Reynaud
Thanks for your feedbacks and answers. We will start the process soon. Jérémy -Message d'origine- De : Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Envoyé : lundi 11 mars 2013 15:49 À : dev@flex.apache.org Objet : Re: Components donation Jérémy, Note: I gave you a quick answer, lik

[jira] [Updated] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Wilson Silva (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Wilson Silva updated FLEX-33345: Attachment: apache.properties > The file frameworks\projects\apache\bundles\pt_PT\apache.proper

[jira] [Updated] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Wilson Silva (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Wilson Silva updated FLEX-33345: Attachment: (was: apache.properties) > The file frameworks\projects\apache\bundles\pt_PT\ap

[jira] [Commented] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Wilson Silva (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13599836#comment-13599836 ] Wilson Silva commented on FLEX-33345: - No problem. I have attached the updated file.

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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.

Re: Components donation

2013-03-12 Thread Frédéric THOMAS
Hi Jérémy, Everybody is busy at the moment, I guess that's the reason why you haven't got so much returns but in few days, I'll put back this thread on the top. Thanks, -Fred -Message d'origine- From: Jérémy Reynaud Sent: Tuesday, March 12, 2013 9:49 AM To: dev@flex.apache.org Subje

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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:

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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 ne

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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: >

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
I'll try this next... Also, shouldn't this be in the Wiki? I remember some of the proponents of this move promised to have all of this documented BEFORE the move, so we'd have a running start when the excrement hit the ventilator... EdB On Tue, Mar 12, 2013 at 10:15 AM, Justin Mclean wrote: >

[jira] [Commented] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Justin Mclean (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13599863#comment-13599863 ] Justin Mclean commented on FLEX-33345: -- Looks much better thanks. I check it one once

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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 f

[jira] [Assigned] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Justin Mclean (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Justin Mclean reassigned FLEX-33345: Assignee: Justin Mclean > The file frameworks\projects\apache\bundles\pt_PT\apache.prop

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 wrote: > Hi, > >> Also, sh

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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 loca

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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

2013-03-12 Thread Frédéric THOMAS
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 submodu

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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? Exc

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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,

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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 t

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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 lin

[Git] Ignore files?

2013-03-12 Thread Erik de Bruin
Hi, I'll keep asking 'noob' questions until I feel comfortable that I can work with git in a manner that won't harm the project. This is only the first one in what I'm sure will be a long series of questions. And before you get tired and shout: "use the internet!", what I'm trying to do is record

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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

2013-03-12 Thread Frédéric THOMAS
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 Subjec

[Git] relative paths in build files

2013-03-12 Thread Erik de Bruin
Hi, How to handle relative paths in ant build files? Example: in the Falcon build file, there is a relative path to the 'develop' branch of the SDK. As I understand it, git uses the same path on the file system, regardless of what branch you're currently working on. Question: how can we take car

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 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. > > Just

[jira] [Commented] (FLEX-33345) The file frameworks\projects\apache\bundles\pt_PT\apache.properties contains no entries

2013-03-12 Thread Wilson Silva (JIRA)
[ https://issues.apache.org/jira/browse/FLEX-33345?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13599915#comment-13599915 ] Wilson Silva commented on FLEX-33345: - Thank you :) > The file framew

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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-sd

Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1

2013-03-12 Thread Swen van Zanten
I don't know if it's been noticed before and it's not really a problem but… The installers are not retina-ready. Just though I mention it. For the rest of it, the installer works great! Swen Op 12 mrt. 2013, om 07:35 heeft Frédéric THOMAS het volgende geschreven: > Ok, I think I've got it fr

Re: [Git] Ignore files?

2013-03-12 Thread Erik de Bruin
Ok, The git equivalent of 'svn:ignore' is apparently a file named ".gitignore" you create in the directory where you want to hide files [1]. I have created one for FalconJx in my local repository/working copy/? and added the same entries as were in 'svn:ignore'. I guess this needs to be done for

Re: SVN to Git migration in progress

2013-03-12 Thread João Fernandes
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 wrote: > Are you sure? > > I did a 'git clone' and 'build.properties' shows: > > # flex-sdk-description values > release = Apache Flex

Re: [Git] Ignore files?

2013-03-12 Thread Michael Schmalle
Yeah, Make sure you read the correct syntax when creating the files and entries. I haven't checked out anything from git yet, got some other things to do today. I have used GIT quite extensively Erik, once you get passed the "blah" of it, your golden. I can help you to with our project if

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 - wh

Re: [Git] Ignore files?

2013-03-12 Thread Erik de Bruin
Mike, Thanks. I'm way out of my depth here, but I've decided to learn by doing. I'll probably break some stuff in the process, but hey! git is supposed to be awesome, so I'm sure we'll manage fixing it. And I'm on OS X, for which I've chosen Tower. It seems to work fine, but until I've pushed/com

Re: [Git] Ignore files?

2013-03-12 Thread Frédéric THOMAS
You can have a .gitignore at user level too, mine, on windows contains : # eclipse conf file .settings .classpath .project .manager .scala_dependencies .cache # idea conf files .idea *.iml *.ipr *.iws # building target build null tmp temp dist test-output build.log #OS junk files [Tt]humbs.db

[Git] ASJS repo migration?

2013-03-12 Thread Erik de Bruin
Hi, Just thought I'd leave this here as well, I've made a comment on the git move JIRA tickets as well... Why wasn't the ASJS repo not migrated? EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl

Re: [Git] Ignore files?

2013-03-12 Thread Carlos Rovira
HI Erik, as you already notice we must to setup the .gitignore file. Until we get write status we can't get this file correctly configured. In the meanwhile you can setup your own until we get write access and can commit it. Now that we are at few hours to fully work on GIT, I'm sure you will lov

Re: SVN to Git migration in progress

2013-03-12 Thread Carlos Rovira
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 Er

Re: [Git] Ignore files?

2013-03-12 Thread Erik de Bruin
Carlos, I don't get it. Mike and I work together, so we need to have the same codebase. When I have made a change that Mike needs to include in his source, in git I do a 'push', in SVN I do a 'commit'. To stay up to date with my code, Mike needs to do a 'pull' in git ('update' in SVN). What's dif

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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, M

Re: [Git] Ignore files?

2013-03-12 Thread Frédéric THOMAS
Instead of a update, I do a pull -rebase to preserve the order of the commits -Message d'origine- From: Erik de Bruin Sent: Tuesday, March 12, 2013 1:05 PM To: dev@flex.apache.org Subject: Re: [Git] Ignore files? Carlos, I don't get it. Mike and I work together, so we need to have th

Re: [Git] Ignore files?

2013-03-12 Thread Erik de Bruin
For future reference... You can set this up with the command: git config --global core.excludesfile ~/.gitignore After which you'll have to create a '.gitignore' file in your home directory and add the ignore patterns. EdB On Tue, Mar 12, 2013 at 12:33 PM, Frédéric THOMAS wrote: > You can h

Re: [Git] relative paths in build files

2013-03-12 Thread Jose Barragan
HI Erik, Well there're many ways, but... the most simple way is, set the desire branch in SDK working copy before you use it from FalconJS repo. -- Jose Barragan Software Architect Chief Codeoscopic Madrid C/. Infanta Mercedes, 92. Planta 5. 505. 28020 Madrid. Tel.: +34 912 94 80 80 On Mar 12

Re: [Git] Ignore files?

2013-03-12 Thread Jose Barragan
Hi Erik, I recommended you the Altassian SourceTree in mac. In order to your question, both Mike and you share the same branch, and you'll commit and push over it like as SVN, in this scenario the previous stage/commit provides you a bullet time for compose and freehand to compare, advance or

AW: SVN to Git migration in progress

2013-03-12 Thread christofer.d...@c-ware.de
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

Re: SVN to Git migration in progress

2013-03-12 Thread Frédéric THOMAS
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 becau

Re: SVN to Git migration in progress

2013-03-12 Thread Michael Schmalle
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

Re: [Git] Ignore files?

2013-03-12 Thread Carlos Rovira
Yes, you both has the same code base. *but* you can fork your feature branch first to manage the integration and then, when conflicts are resolved and tested and you are ready, you can merge again to your feature branch. Then again when you all agree that you are feature complete, you can merge to

Re: [Git] Ignore files?

2013-03-12 Thread Kevin Newman
Push and Pull have to do with syncing to a remote repo. You can still commit to a local git (in fact you must, before you push or pull). The big difference between git and svn is git keeps the entire history locally, rather than only on a server like with svn. You can also just zip up your loca

Re: SVN to Git migration in progress

2013-03-12 Thread RIAstar
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:

RE: SVN to Git migration in progress

2013-03-12 Thread Michael A. Labriola
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

Re: SVN to Git migration in progress

2013-03-12 Thread Justin Mclean
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

2013-03-12 Thread Justin Mclean
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

TLF Issue (was Re: SVN to Git migration in progress)

2013-03-12 Thread Alex Harui
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.

Re: [Git] Ignore files?

2013-03-12 Thread Dasa Paddock
I'd second the SourceTree recommendation. (They're also working on a version for Windows.) Atlassian also has some good Git tutorial and training info available here: http://www.atlassian.com/git/ --Dasa On Mar 12, 2013, at 9:43 AM, Jose Barragan wrote: > Hi Erik, > > I recommended you the

RE: SVN to Git migration in progress

2013-03-12 Thread Gordon Smith
> "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

RE: SVN to Git migration in progress

2013-03-12 Thread Gordon Smith
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

Re: [Git] relative paths in build files

2013-03-12 Thread Erik de Bruin
Yes, I figured as much... but that should at least be in the README and better would be if there was a way to check this and warn the user... EdB On Tue, Mar 12, 2013 at 5:48 PM, Jose Barragan wrote: > HI Erik, > > Well there're many ways, but... the most simple way is, set the desire branch

Re: [Git] Ignore files?

2013-03-12 Thread Kevin Newman
I like TortoiseGit for Windows. It's my favorite on any platform (I hear there's something similar on Ubuntu, but I haven't tried it). I'd love something like it for OSX. Kevin N.

Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
All, Before we get into lengthy debates about Git and Git vs. SVN, etc. we need to first finish the migration process so that the new Git repos will become Read-Write. This means that the Flex PMC should first accept the new branches and give INFRA a go-ahead. Here is INFRA's comment on the JIR

Re: [Git] Ignore files?

2013-03-12 Thread Erik de Bruin
> In order to your question, both Mike and you share the same branch, and > you'll commit and push over it like as SVN, in this scenario the previous > stage/commit provides you a bullet time for compose and freehand to compare, > advance or reverse in time before commit and push. I have some h

RE: Finishing the Git migration - READ FIRST

2013-03-12 Thread Gordon Smith
> let us first come to a decision whether we are happy with the new Git repos > or not. I looked back through the emails and can't find the URL for the new Git repo. Can we inspect it using a browser or do we have to install a Git client? - Gordon -Original Message- From: omup...@gmail

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Erik de Bruin
PMC member here: I'm not satisfied yet, as the ASJS project is not in git, as far as I can tell... EdB On Tue, Mar 12, 2013 at 6:48 PM, Om wrote: > All, > > Before we get into lengthy debates about Git and Git vs. SVN, etc. we need > to first finish the migration process so that the new Git r

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 10:53 AM, Gordon Smith wrote: > > let us first come to a decision whether we are happy with the new Git > repos or not. > > I looked back through the emails and can't find the URL for the new Git > repo. Can we inspect it using a browser or do we have to install a Git > cl

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Alex Harui
Ah, if you go here: SVN shows way more than 4: http://svn.apache.org/viewvc/flex/ asjs external whiteboard I saw we move the whiteboards. Why keep new stuff on SVN and then have it migrate it to Git later? On 3/12/13 10:55 AM, "Om" wrote: > On Tue, Mar 12, 2013 at 10:53 AM, Gordon Smith wr

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 w

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 11:00 AM, Alex Harui wrote: > Ah, if you go here: SVN shows way more than 4: > > http://svn.apache.org/viewvc/flex/ > > asjs > external > whiteboard > > I saw we move the whiteboards. Why keep new stuff on SVN and then have it > migrate it to Git later? > > I agree. I d

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Erik de Bruin
For future reference: this is a list of all Apache git projects with 'flex' in their name: https://git-wip-us.apache.org/repos/asf?s=flex EdB On Tue, Mar 12, 2013 at 7:28 PM, Om wrote: > On Tue, Mar 12, 2013 at 11:00 AM, Alex Harui wrote: > >> Ah, if you go here: SVN shows way more than 4:

Re: TLF Issue (was Re: SVN to Git migration in progress)

2013-03-12 Thread Frédéric THOMAS
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

Re: SVN to Git migration in progress

2013-03-12 Thread Om
> > 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 dire

RE: Finishing the Git migration - READ FIRST

2013-03-12 Thread Gordon Smith
Does the "wip" in the URLs mean "work-in-progress"? If so, does that mean these URLs aren't the final URLs? - Gordon -Original Message- From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om Sent: Tuesday, March 12, 2013 10:56 AM To: dev@flex.apache.org Subject: Re: Finishing

Re: [Git] Ignore files?

2013-03-12 Thread Justin Mclean
Hi, > Now that we are at few hours to fully work on GIT, I'm sure you will love > it. For example, you could work with Mike much better making your own > branches and taking control over your commits and what you want to share in > the remote repository. The problems you both face the previous wee

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Alex Harui
On 3/12/13 11:28 AM, "Om" wrote: > On Tue, Mar 12, 2013 at 11:00 AM, Alex Harui wrote: > >> Ah, if you go here: SVN shows way more than 4: >> >> http://svn.apache.org/viewvc/flex/ >> >> asjs >> external >> whiteboard >> >> I saw we move the whiteboards. Why keep new stuff on SVN and the

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 11:46 AM, Gordon Smith wrote: > Does the "wip" in the URLs mean "work-in-progress"? If so, does that mean > these URLs aren't the final URLs? > > Apparently, it is [1] But even if the urls change at a future date, it shouldnt make a difference as long as the repos are mig

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 11:55 AM, Alex Harui wrote: > > > > On 3/12/13 11:28 AM, "Om" wrote: > > > On Tue, Mar 12, 2013 at 11:00 AM, Alex Harui wrote: > > > >> Ah, if you go here: SVN shows way more than 4: > >> > >> http://svn.apache.org/viewvc/flex/ > >> > >> asjs > >> external > >> whiteboa

Re: SVN to Git migration in progress

2013-03-12 Thread Alex Harui
On 3/12/13 11:11 AM, "Erik de Bruin" 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

Re: SVN to Git migration in progress

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 12:00 PM, Erik de Bruin 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 wo

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Alex Harui
On 3/12/13 12:01 PM, "Om" wrote: > > > Alright, so this is the final list I am going to add to the JIRA ticket: > >1. asjs >2. external >3. whiteboard > > When this email is 1 hour old, I will be adding a comment to the JIRA > ticket. I will also ask them to go ahead and make

Re: Finishing the Git migration - READ FIRST

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 12:07 PM, Alex Harui wrote: > > > > On 3/12/13 12:01 PM, "Om" wrote: > > > > > > > > Alright, so this is the final list I am going to add to the JIRA ticket: > > > >1. asjs > >2. external > >3. whiteboard > > > > When this email is 1 hour old, I will be adding

Re: TLF Issue (was Re: SVN to Git migration in progress)

2013-03-12 Thread Alex Harui
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 an

Re: SVN to Git migration in progress

2013-03-12 Thread Erik de Bruin
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 Wi

Re: SVN to Git migration in progress

2013-03-12 Thread Om
On Tue, Mar 12, 2013 at 12:14 PM, Erik de Bruin 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

Re: TLF Issue (was Re: SVN to Git migration in progress)

2013-03-12 Thread Harbs
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 "rep

  1   2   >