Re: Finishing the Git migration - Update

[Om]

On Tue, Mar 12, 2013 at 11:48 PM, Justin Mclean wrote:

> Hi,
>
> Do we know what happens to the git hub mirrors?
>
> Justin
>


Not sure.  I will ask Infra once they finish the migration.  I dont want to
sidetrack them at this point :-)

Re: Finishing the Git migration - Update

[Justin Mclean]

Hi,

Do we know what happens to the git hub mirrors?

Justin

Finishing the Git migration - Update

[Om]

> 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 the git repos
>>> read/write
>>> > after these repos are added.
>>> >
>>> Process-wise, they may require that we verify the contents of each of
>>> these
>>> "projects" before we get write access.
>>>
>>>
>> Okay, I will wait to ask for read/write access until after we agree that
>> everything looks good.  I will ask for these new repos to be added in the
>> meantime.
>>
>>
>>
>>> Do we know if by "PMC approval" we need to have an official vote?
>>>
>>>
>> I would go for lazy consensus if no one has objections.
>>
>>
> Infra says that there is no need for an official vote.
>
>
>
>> Thanks,
>> Om
>>
>>

A quick update.  I had updated the JIRA ticket earlier today.  I have not
heard back from Infra yet.  I have pinged them again stressing the need for
urgency.

>From our side, can we all take a look at the projects that have already
been moved?   These are the projects in question:

Falcon:
svn:  http://svn.apache.org/viewvc/flex/falcon/
git: https://git-wip-us.apache.org/repos/asf?p=flex-falcon.git

SDK:
svn: http://svn.apache.org/viewvc/flex/sdk/
git: https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git

TLF:
svn: http://svn.apache.org/viewvc/flex/tlf/
git: https://git-wip-us.apache.org/repos/asf?p=flex-tlf.git

Utilities:
svn: http://svn.apache.org/viewvc/flex/utilities/
git: https://git-wip-us.apache.org/repos/asf?p=flex-utilities.git

Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1

[Om]

On Mar 12, 2013 5:53 PM, "Nicholas Kwiatkowski"  wrote:
>
> A few comments on the installer :
>
> - The disclaimer "Information about your use of this application"
> should really link to our privacy policy.
> http://flex.apache.org/about-privacy.html

Makes sense.  I will add this link.

> - I like the new check-marks for the license agreements.  This helps with
> usability a LOT.
> - The app's UI becomes unresponsive during the verification of the MD5
> hash.  Any way we can green-thread this so that the end user dosen't think
> something is wrong?

This is next on my list.  I am thinking of using AS worker API for this.

>
> Otherwise, functionally, it works fine.  Both Windows 7 x64 and MacOS X
> 10.6 and 10.8
>
> -Nick
>
>
>
> On Tue, Mar 12, 2013 at 7:00 AM, Swen van Zanten  wrote:
>
> > 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 from this tickect
> > https://issues.apache.org/jira/browse/INFRA-5549 [1], so, I'm going to
> > wait everything is ok and writable before I try to loose everything.
> > >
> > > -Fred
> > >
> > > [1]
> > > I've migrated the repos as follows:
> > > https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> > > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> > > https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> > > https://git-wip-us.apache.org/repos/asf/flex-utilities.git
> > >
> > > I have not migrated whiteboard or site. (site will stay SVN, and be
> > writable after we're finished with this.)
> > > I am open to moving whiteboard, but you'll have to tell me explicitly
> > that you want to move it - otherwise when we are done I'll make both
site
> > and whiteboard writable in SVN.
> > >
> > > The git repos are also read only. Please have the FLEX PMC look at the
> > repos, see if they are acceptable, all branches are present, etc, and if
> > found accordingly, please update this ticket and I'll make them
writable.
> > >
> > > -Message d'origine- From: Frédéric THOMAS
> > > Sent: Tuesday, March 12, 2013 7:26 AM
> > > To: dev@flex.apache.org
> > > Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> > >
> > > Just to be sure, what's the exact address for the develop branch ?
> > >
> > > http://git.apache.org/flex-sdk.git or
http://github.com/apache/flex-sdkor
> > > that the same pointer ?
> > >
> > > -Fred
> > >
> > > -Message d'origine- From: Justin Mclean
> > > Sent: Tuesday, March 12, 2013 7:10 AM
> > > To: dev@flex.apache.org
> > > Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> > >
> > > Hi,
> > >
> > >> Then what's the process to move SCM w/o to loose anything ?
> > >
> > >
> > > Best way I think is to do a full git clone in a new area, create a
patch
> > in
> > > SVN and then reapply that patch to the new git repo just trying that
now.
> > > Anyone have any other ideas?
> > >
> > > Justin
> > >
> >
> >

Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1

[Nicholas Kwiatkowski]

A few comments on the installer :

- The disclaimer "Information about your use of this application"
should really link to our privacy policy.
http://flex.apache.org/about-privacy.html
- I like the new check-marks for the license agreements.  This helps with
usability a LOT.
- The app's UI becomes unresponsive during the verification of the MD5
hash.  Any way we can green-thread this so that the end user dosen't think
something is wrong?

Otherwise, functionally, it works fine.  Both Windows 7 x64 and MacOS X
10.6 and 10.8

-Nick



On Tue, Mar 12, 2013 at 7:00 AM, Swen van Zanten  wrote:

> 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 from this tickect
> https://issues.apache.org/jira/browse/INFRA-5549 [1], so, I'm going to
> wait everything is ok and writable before I try to loose everything.
> >
> > -Fred
> >
> > [1]
> > I've migrated the repos as follows:
> > https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> > https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> > https://git-wip-us.apache.org/repos/asf/flex-utilities.git
> >
> > I have not migrated whiteboard or site. (site will stay SVN, and be
> writable after we're finished with this.)
> > I am open to moving whiteboard, but you'll have to tell me explicitly
> that you want to move it - otherwise when we are done I'll make both site
> and whiteboard writable in SVN.
> >
> > The git repos are also read only. Please have the FLEX PMC look at the
> repos, see if they are acceptable, all branches are present, etc, and if
> found accordingly, please update this ticket and I'll make them writable.
> >
> > -Message d'origine- From: Frédéric THOMAS
> > Sent: Tuesday, March 12, 2013 7:26 AM
> > To: dev@flex.apache.org
> > Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> >
> > Just to be sure, what's the exact address for the develop branch ?
> >
> > http://git.apache.org/flex-sdk.git or http://github.com/apache/flex-sdkor
> > that the same pointer ?
> >
> > -Fred
> >
> > -Message d'origine- From: Justin Mclean
> > Sent: Tuesday, March 12, 2013 7:10 AM
> > To: dev@flex.apache.org
> > Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> >
> > Hi,
> >
> >> Then what's the process to move SCM w/o to loose anything ?
> >
> >
> > Best way I think is to do a full git clone in a new area, create a patch
> in
> > SVN and then reapply that patch to the new git repo just trying that now.
> > Anyone have any other ideas?
> >
> > Justin
> >
>
>

[jira] [Updated] (FLEX-33397) Spark button skin doesn't exclude coloring icon.

[Mark Kessler (JIRA)]

 [ 
https://issues.apache.org/jira/browse/FLEX-33397?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Mark Kessler updated FLEX-33397:


Attachment: ButtonSkin.patch

Patch

> Spark button skin doesn't exclude coloring icon.
> 
>
> Key: FLEX-33397
> URL: https://issues.apache.org/jira/browse/FLEX-33397
> Project: Apache Flex
>  Issue Type: Bug
>  Components: Skinning
>Affects Versions: Adobe Flex SDK 4.6 (Release), Apache Flex 4.9.0
>Reporter: Mark Kessler
>Priority: Minor
>  Labels: easyfix
> Attachments: ButtonSkin.mxml, ButtonSkin.patch
>
>   Original Estimate: 1m
>  Remaining Estimate: 1m
>
> The chromeColor style is coloring the icon for for the spark buttons. The fix 
> was to add the iconDisplay to the exclusions variable in the ButtonSkin.mxml

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Re: [Git] Ignore files?

[Justin Mclean]

Hi,

> we should only share things with great potential to be merged in develop.

Seems reasonable to me - but it may become a bit of a mess if we are not 
careful.

More questions for the wiki that need an answer:

How do we avoid the big bang integration issues that occur with this model? For 
instance making 4.9 was a huge pain having to merge in all the changes that had 
occurred since 4.8, I would hate to have to do that with 20 or 30 branches.

If we have a large number of branches is it the release managers job to merge 
them all or the person who created the branch, what if they are no longer about?

How do we prune branches that are no longer actively been worked on?

Thanks,
Justin

Re: [Git] Ignore files?

[Carlos Rovira]

Yes, I was thinking that you was saying that he ;)... we should only share
things with great potential to be merged in develop.

2013/3/12 Justin Mclean 

> Hi,
>
> > normaly you should expect people share a feature branch if is intended to
> > work with other people or is intended to be merged against develop.
> That may be the way you use Git but it's not describe that way in the
> GitFlow model look at the sample commands for creating and working on a
> feature branch.
>
> I hope you not saying that all branches we create should be remote because
> that waters down Git benefit of working locally.
>
> Thanks,
> Justin




-- 
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: [Git] Ignore files?

[Carlos Rovira]

Hi Justin,

I will try to help here tomorrow night.

2013/3/12 Justin Mclean 

> HI,
>
> Calos any chance you could help out with the Wiki page so people
> unfamiliar with Git have something to work with. In particular we need how
> it applies to/how to use it wit our project and things to be careful with
> for instance -git pull vs fetch, git merge vs rebase, git pull -rebase and
> git merge --no-ff.
>
> Justin




-- 
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: [Git] Ignore files?

[Justin Mclean]

Hi,

> normaly you should expect people share a feature branch if is intended to
> work with other people or is intended to be merged against develop.
That may be the way you use Git but it's not describe that way in the GitFlow 
model look at the sample commands for creating and working on a feature branch.

I hope you not saying that all branches we create should be remote because that 
waters down Git benefit of working locally.

Thanks,
Justin

Re: [Git] Ignore files?

[Justin Mclean]

HI,

Calos any chance you could help out with the Wiki page so people unfamiliar 
with Git have something to work with. In particular we need how it applies 
to/how to use it wit our project and things to be careful with for instance 
-git pull vs fetch, git merge vs rebase, git pull -rebase and git merge --no-ff.

Justin

Re: [Git] Ignore files?

[Carlos Rovira]

Hi Justin,

normaly you should expect people share a feature branch if is intended to
work with other people or is intended to be merged against develop. Take
into account that as Mike Labriola said, there's people that makes several
branches and many of them will never come to an end, so that will only make
the remote repo mostly unusable. Regarding the Apache Model, the sentence
was thinked for VCS like SVN where all happen in trunk...so here we should
notice that all that is merged to develop (a.k.b. trunk) will be promoting
the Apache way of life as expected.



2013/3/12 Justin Mclean 

> Hi,
>
> > I'm not saying nothing against nvie (I give the same link in several
> emails
> > here),
> I actually posted before that but for some reason my email arrived out of
> sequence.
>
> > Yo can make whatever experimental things you want and work with other
> > people in *feature* branches
> Not exactly "feature branches typically exist in developer repos only" and
> the examples show that. I don't think we want people sharing branches
> outside the main repo as it preferable from an ASF perspective that all
> work is done where people can see it.
>
> Would be good to add this to the Wiki if each branch is local or remote
> for those unfamiliar with git and gitflow.
>
> Thanks,
> Justin




-- 
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: [Git] Ignore files?

[Carlos Rovira]

"nothing I've read so far makes me think that git isn't just another
version control system"

mmm...following the same line of thinking...flex is nothing more like other
web tech & framework, so why we stand with it when we could go with some
basic HTML/JS scripts out there
 ;)

Erik, sincerily, I understand you are right now trapped in a kind of
Kübler-Ross model with frustration about this drastic change. Normal since
from one day to other you lost the control you already had with SVN. And
worst of it, you didn't want this VCS change..., but many people here want
to enter GIT VCS and Nvie model. Please, try to manage this puntual problem
and let the GIT magic flow to make you another passion-gitter (this word
exist? ;)) like many of us. As many of us said here before, we're sure you
will love it and in few months you'll never would want to go backwards.


2013/3/12 Erik de Bruin 
>
>
> I'll try to be patient and study. But nothing I've read so far makes
> me think that git isn't just another version control system, and that
> it doesn't bring anything to this project that solves a problem we had
> - I know of no problems with SVN - and I'm pretty sure it will
> introduce problems that we never had, especially for release managers
> and newbie contributors.
>
> EdB
>
>
>
> --
> 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: [Git] Ignore files?

[Justin Mclean]

Hi,

> I'm not saying nothing against nvie (I give the same link in several emails
> here),
I actually posted before that but for some reason my email arrived out of 
sequence.

> Yo can make whatever experimental things you want and work with other
> people in *feature* branches
Not exactly "feature branches typically exist in developer repos only" and the 
examples show that. I don't think we want people sharing branches outside the 
main repo as it preferable from an ASF perspective that all work is done where 
people can see it.

Would be good to add this to the Wiki if each branch is local or remote for 
those unfamiliar with git and gitflow.

Thanks,
Justin

Re: [Git] Ignore files?

[Carlos Rovira]

Hi Justin,

I'm not saying nothing against nvie (I give the same link in several emails
here), we use that model at work and we already do things like the ones I
describe.

Yo can make whatever experimental things you want and work with other
people in *feature* branches but in the end main flows are dictated by nvie
model...so when
you master, develop, release, hotfixes and features are integrated in that
nvie model.




2013/3/12 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 week where
> > one can step changes over the other are gone thanks to branching feature.
> > You only have to take patience to master this feature and you will see
> that
> > is very powerful and get lots of control. In SVN the main problem is that
> > all happens in one single place since branches are not usable and this
> > causes that kind problems while working with other people.
>
> Just a reminder that we voted on using the gitflow model. [1] This is not
> quite the free for all model you describe above and at same point you still
> have to merge everything into the develop branch.
>
> Justin
>
> 1. http://nvie.com/posts/a-successful-git-branching-model/
>
>


-- 
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: TLF Issue (was Re: SVN to Git migration in progress)

[Alex Harui]

Harbs is correct for a potential longer-term usage.  It might be easier to
mimic the Flash dependencies it has in HTML/JS.  The vast majority of the
code is computation of glyph positions.

For the short-term, since we're trying to emulate what you'll get in the
browser when running in Flash, we may use TLF to take html markup and
display it.


On 3/12/13 2:11 PM, "Harbs"  wrote:

> 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?
> 

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui

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

[Harbs]

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: TLF Issue (was Re: SVN to Git migration in progress)

[Om]

On Tue, Mar 12, 2013 at 1:18 PM, Alex Harui  wrote:

>
>
>
> On 3/12/13 1:03 PM, "Om"  wrote:
>
> > On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui  wrote:
> >
> >>
> >>
> >>
> >> On 3/12/13 12:26 PM, "Harbs"  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)

[Alex Harui]

On 3/12/13 1:03 PM, "Om"  wrote:

> On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui  wrote:
> 
>> 
>> 
>> 
>> On 3/12/13 12:26 PM, "Harbs"  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)

[Justin Mclean]

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: Finishing the Git migration - READ FIRST

[Justin Mclean]

Hi,

> Does the "wip" in the URLs mean "work-in-progress"? If so, does that mean 
> these URLs aren't the final URLs?

GIt support is still a work in progress at Apache. I assume one day they will 
change once git is fully supported by infra.

Justin

Re: Finishing the Git migration - READ FIRST

[Justin Mclean]

HI,

>   - site

Because of the CMS the site need to stay in SVN. Remove it from the list.

Justin

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

[Om]

On Tue, Mar 12, 2013 at 12:58 PM, Alex Harui  wrote:

>
>
>
> On 3/12/13 12:26 PM, "Harbs"  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)

[Alex Harui]

On 3/12/13 12:26 PM, "Harbs"  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: Spelling Plus Library (SPL) Open Sourced

[Om]

On Tue, Mar 5, 2013 at 3:42 PM, Wes Gorgichuk  wrote:

> Hey everyone;
>
> I've noticed a few posts recently about possibly getting Squiggly
> donated to this project. That got me thinking about our own (gskinner.com's)
> spelling library.  It was a commercial project that we've had ongoing for
> around 6 years, however lately it has grown stagnate, so it was time to
> open-source it. Werecently released it under an MIT license on GitHub (
> http://www.github.com/**gskinner/SPL ).
>  I know its not a donation to this project, but being MIT anyone can take
> the source and do anything they want with it.
>
> The current version fully supports the Flash component set, TextField, TLF
> and RichEditableText in both Flash, and the Flex SDK (both 3.x and 4.x).
> Officially it supports English (US and UK), however there are additional
> dictionaries for Spanish, French, and German. We also have a AIR
> application that lets you easily create new dictionary files in your own
> language (the source is also in that GitHub repo). You can read more here;
> http://gskinner.com/products/**spl/ (and 
> checkout a live demo).  The source for those demos is all in the
> GitHub repo.
>
> Our hope is by open sourcing it the library will find a new life in the
> open-source community.  And maybe even in the Flex sdk ... :)
>
> Wes Gorgichuk
> gskinner.com
>
>

Wes,

Thanks for this notification.  I have used SPL for a past (we preferred it
over Squigly) and I have to say it was great and just worked.  I would like
to point out to you that Apache policy does not allow us to bring over
other license holders' code into the project without their explicit grant -
regardless of their license.

I think there would be sufficient interest in making use of the SPL library
if you or your company can provide Apache Flex with the software grants.

If you are interested, the process is as follows :

1. You fill out and sign all legal documents
2. Some of us will review the code (it can be given via a zip associated to
a JIRA ticket).  If it looks ok, we will start the committer approval
process for you.  Takes a minimum of 3 business days.
3. We discuss where this code should land, the package names.
4. Once the software grant is recorded, someone can check in the code.
5. Once it is in, it gets another review.  This means making sure there are
no binaries, that the headers are correct, that your copyrights (but not
any third-party copyrights) are moved to the NOTICES file (which must be
done by you or with your explicit permission).
6. Based on 3, all kinds of good stuff happens.

[1] 
http://www.apache.org/**licenses/icla.txt
[2] 
http://www.apache.org/**licenses/cla-corporate.txt
[3] 
http://www.apache.org/**licenses/software-grant.txt

Thanks again,
Om

P.S.  Thanks to Frederick Thomas for documenting the process

Re: SVN to Git migration in progress

[Erik de Bruin]

Thank you, I needed kittens!

EdB



On Tue, Mar 12, 2013 at 8:21 PM, Om  wrote:
> 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 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  wrote:
>> >
>> >
>> >
>> > 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 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: Finishing the Git migration - READ FIRST

[Om]

On Tue, Mar 12, 2013 at 12:10 PM, Om  wrote:

> 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 a comment to the JIRA
>> > ticket.  I will also ask them to go ahead and make the git repos
>> read/write
>> > after these repos are added.
>> >
>> Process-wise, they may require that we verify the contents of each of
>> these
>> "projects" before we get write access.
>>
>>
> Okay, I will wait to ask for read/write access until after we agree that
> everything looks good.  I will ask for these new repos to be added in the
> meantime.
>
>
>
>> Do we know if by "PMC approval" we need to have an official vote?
>>
>>
> I would go for lazy consensus if no one has objections.
>
>
Infra says that there is no need for an official vote.



> Thanks,
> Om
>
>
>>  --
>> Alex Harui
>> Flex SDK Team
>> Adobe Systems, Inc.
>> http://blogs.adobe.com/aharui
>>
>>
>

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

[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 "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"  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"  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

[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 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  wrote:
> >
> >
> >
> > 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 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: SVN to Git migration in progress

[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
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.



On Tue, Mar 12, 2013 at 8:03 PM, Alex Harui  wrote:
>
>
>
> 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 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)

[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 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"  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"  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: Finishing the Git migration - READ FIRST

[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 a comment to the JIRA
> > ticket.  I will also ask them to go ahead and make the git repos
> read/write
> > after these repos are added.
> >
> Process-wise, they may require that we verify the contents of each of these
> "projects" before we get write access.
>
>
Okay, I will wait to ask for read/write access until after we agree that
everything looks good.  I will ask for these new repos to be added in the
meantime.



> Do we know if by "PMC approval" we need to have an official vote?
>
>
I would go for lazy consensus if no one has objections.

Thanks,
Om


>  --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
>

Re: Finishing the Git migration - READ FIRST

[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 the git repos read/write
> after these repos are added.
> 
Process-wise, they may require that we verify the contents of each of these
"projects" before we get write access.

Do we know if by "PMC approval" we need to have an official vote?

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui

Re: SVN to Git migration in progress

[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 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  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
> >>  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

[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 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: Finishing the Git migration - READ FIRST

[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
> >> 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 dont see a point in having a few on svn and a few on git.  I
> > have this list for now (I added "site")
> >
> >
> >- asjs
> >- external
> >- whiteboard
> >- site
> >
> >
> > What about the "tlf" repo?
> >
> TLF was already migrated as flex-tlf.  I don't think they will move site as
> the site requires svnpubsub.
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>


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 the git repos read/write
after these repos are added.

If you have any objections or anything else to add, this is the time.

Thanks,
Om

Re: SVN to Git migration in progress

[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 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  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
>>  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: Finishing the Git migration - READ FIRST

[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 migrated properly (by
Infra)

[1] https://git-wip-us.apache.org/#contents


>  - 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 the Git migration - READ FIRST
>
> 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 client?
> >
> >
> The links are in the JIRA ticket.  But here they are again - all browsable.
>
>
> https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> https://git-wip-us.apache.org/repos/asf/flex-utilities.git
>
> Thanks,
> Om
>
>
> > - Gordon
> >
> > -Original Message-
> > From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
> > Sent: Tuesday, March 12, 2013 10:49 AM
> > To: dev@flex.apache.org
> > Subject: Finishing the Git migration - READ FIRST
> >
> > 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 JIRA ticket [1]
> >
> > "The git repos are also read only. Please have the FLEX PMC look at
> > the repos, see if they are acceptable, all branches are present, etc,
> > and if found accordingly, please update this ticket and I'll make them
> writable."
> >
> > Instead of posting comments and discussing on the JIRA ticket, let us
> > first come to a decision whether we are happy with the new Git repos or
> not.
> >
> > *Please respond to this thread with details on what repos are missing
> > (projects, whiteboards, etc.)  *Once we have a consensus, I will post
> > that list on the JIRA ticket.  Once all those Reps are migrated to
> > Git, we can give INFRA the go ahead to make them all read-write.
> >
> > Once that is done, we can apply a fix to the SDK - TLF problem and
> > push it to the repo.
> >
> > To re-iterate, it is a waste of everyone's  energy to keep discussing
> > potential fixes to any problem without getting the Git repos to become
> > read-write.
> >
> > Thanks,
> > Om
> >
> > [1] https://issues.apache.org/jira/browse/INFRA-5549
> >
>

Re: Finishing the Git migration - READ FIRST

[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 then have it
>> migrate it to Git later?
>> 
>> 
> I agree.  I dont see a point in having a few on svn and a few on git.  I
> have this list for now (I added "site")
> 
> 
>- asjs
>- external
>- whiteboard
>- site
> 
> 
> What about the "tlf" repo?
> 
TLF was already migrated as flex-tlf.  I don't think they will move site as
the site requires svnpubsub.

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui

Re: [Git] Ignore files?

[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 week where
> one can step changes over the other are gone thanks to branching feature.
> You only have to take patience to master this feature and you will see that
> is very powerful and get lots of control. In SVN the main problem is that
> all happens in one single place since branches are not usable and this
> causes that kind problems while working with other people.

Just a reminder that we voted on using the gitflow model. [1] This is not quite 
the free for all model you describe above and at same point you still have to 
merge everything into the develop branch.

Justin

1. http://nvie.com/posts/a-successful-git-branching-model/

RE: Finishing the Git migration - READ FIRST

[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 the Git migration - READ FIRST

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 client?
>
>
The links are in the JIRA ticket.  But here they are again - all browsable.


https://git-wip-us.apache.org/repos/asf/flex-falcon.git
https://git-wip-us.apache.org/repos/asf/flex-sdk.git
https://git-wip-us.apache.org/repos/asf/flex-tlf.git
https://git-wip-us.apache.org/repos/asf/flex-utilities.git

Thanks,
Om


> - Gordon
>
> -Original Message-
> From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
> Sent: Tuesday, March 12, 2013 10:49 AM
> To: dev@flex.apache.org
> Subject: Finishing the Git migration - READ FIRST
>
> 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 JIRA ticket [1]
>
> "The git repos are also read only. Please have the FLEX PMC look at 
> the repos, see if they are acceptable, all branches are present, etc, 
> and if found accordingly, please update this ticket and I'll make them 
> writable."
>
> Instead of posting comments and discussing on the JIRA ticket, let us 
> first come to a decision whether we are happy with the new Git repos or not.
>
> *Please respond to this thread with details on what repos are missing 
> (projects, whiteboards, etc.)  *Once we have a consensus, I will post 
> that list on the JIRA ticket.  Once all those Reps are migrated to 
> Git, we can give INFRA the go ahead to make them all read-write.
>
> Once that is done, we can apply a fix to the SDK - TLF problem and 
> push it to the repo.
>
> To re-iterate, it is a waste of everyone's  energy to keep discussing 
> potential fixes to any problem without getting the Git repos to become 
> read-write.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549
>

Re: SVN to Git migration in progress

[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 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
>  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)

[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 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"  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: Finishing the Git migration - READ FIRST

[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:
>>
>> 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 dont see a point in having a few on svn and a few on git.  I
> have this list for now (I added "site")
>
>
>- asjs
>- external
>- whiteboard
>- site
>
>
> What about the "tlf" repo?
>
>
>
>>  On 3/12/13 10:55 AM, "Om"  wrote:
>>
>> > 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
>> >> client?
>> >>
>> >>
>> > The links are in the JIRA ticket.  But here they are again - all
>> browsable.
>> >
>> >
>> > https://git-wip-us.apache.org/repos/asf/flex-falcon.git
>> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
>> > https://git-wip-us.apache.org/repos/asf/flex-tlf.git
>> > https://git-wip-us.apache.org/repos/asf/flex-utilities.git
>> >
>> > Thanks,
>> > Om
>> >
>> >
>> >> - Gordon
>> >>
>> >> -Original Message-
>> >> From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
>> >> Sent: Tuesday, March 12, 2013 10:49 AM
>> >> To: dev@flex.apache.org
>> >> Subject: Finishing the Git migration - READ FIRST
>> >>
>> >> 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
>> >> JIRA ticket [1]
>> >>
>> >> "The git repos are also read only. Please have the FLEX PMC look at the
>> >> repos, see if they are acceptable, all branches are present, etc, and if
>> >> found accordingly, please update this ticket and I'll make them
>> writable."
>> >>
>> >> Instead of posting comments and discussing on the JIRA ticket, let us
>> >> first come to a decision whether we are happy with the new Git repos or
>> not.
>> >>
>> >> *Please respond to this thread with details on what repos are missing
>> >> (projects, whiteboards, etc.)  *Once we have a consensus, I will post
>> that
>> >> list on the JIRA ticket.  Once all those Reps are migrated to Git, we
>> can
>> >> give INFRA the go ahead to make them all read-write.
>> >>
>> >> Once that is done, we can apply a fix to the SDK - TLF problem and push
>> it
>> >> to the repo.
>> >>
>> >> To re-iterate, it is a waste of everyone's  energy to keep discussing
>> >> potential fixes to any problem without getting the Git repos to become
>> >> read-write.
>> >>
>> >> Thanks,
>> >> Om
>> >>
>> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
>> >>
>>
>> --
>> 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: Finishing the Git migration - READ FIRST

[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 dont see a point in having a few on svn and a few on git.  I
have this list for now (I added "site")


   - asjs
   - external
   - whiteboard
   - site


What about the "tlf" repo?



>  On 3/12/13 10:55 AM, "Om"  wrote:
>
> > 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
> >> client?
> >>
> >>
> > The links are in the JIRA ticket.  But here they are again - all
> browsable.
> >
> >
> > https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> > https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> > https://git-wip-us.apache.org/repos/asf/flex-utilities.git
> >
> > Thanks,
> > Om
> >
> >
> >> - Gordon
> >>
> >> -Original Message-
> >> From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
> >> Sent: Tuesday, March 12, 2013 10:49 AM
> >> To: dev@flex.apache.org
> >> Subject: Finishing the Git migration - READ FIRST
> >>
> >> 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
> >> JIRA ticket [1]
> >>
> >> "The git repos are also read only. Please have the FLEX PMC look at the
> >> repos, see if they are acceptable, all branches are present, etc, and if
> >> found accordingly, please update this ticket and I'll make them
> writable."
> >>
> >> Instead of posting comments and discussing on the JIRA ticket, let us
> >> first come to a decision whether we are happy with the new Git repos or
> not.
> >>
> >> *Please respond to this thread with details on what repos are missing
> >> (projects, whiteboards, etc.)  *Once we have a consensus, I will post
> that
> >> list on the JIRA ticket.  Once all those Reps are migrated to Git, we
> can
> >> give INFRA the go ahead to make them all read-write.
> >>
> >> Once that is done, we can apply a fix to the SDK - TLF problem and push
> it
> >> to the repo.
> >>
> >> To re-iterate, it is a waste of everyone's  energy to keep discussing
> >> potential fixes to any problem without getting the Git repos to become
> >> read-write.
> >>
> >> Thanks,
> >> Om
> >>
> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
> >>
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
>

Re: SVN to Git migration in progress

[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 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
 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: Finishing the Git migration - READ FIRST

[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  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
>> client?
>> 
>> 
> The links are in the JIRA ticket.  But here they are again - all browsable.
> 
> 
> https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> https://git-wip-us.apache.org/repos/asf/flex-utilities.git
> 
> Thanks,
> Om
> 
> 
>> - Gordon
>> 
>> -Original Message-
>> From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
>> Sent: Tuesday, March 12, 2013 10:49 AM
>> To: dev@flex.apache.org
>> Subject: Finishing the Git migration - READ FIRST
>> 
>> 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
>> JIRA ticket [1]
>> 
>> "The git repos are also read only. Please have the FLEX PMC look at the
>> repos, see if they are acceptable, all branches are present, etc, and if
>> found accordingly, please update this ticket and I'll make them writable."
>> 
>> Instead of posting comments and discussing on the JIRA ticket, let us
>> first come to a decision whether we are happy with the new Git repos or not.
>> 
>> *Please respond to this thread with details on what repos are missing
>> (projects, whiteboards, etc.)  *Once we have a consensus, I will post that
>> list on the JIRA ticket.  Once all those Reps are migrated to Git, we can
>> give INFRA the go ahead to make them all read-write.
>> 
>> Once that is done, we can apply a fix to the SDK - TLF problem and push it
>> to the repo.
>> 
>> To re-iterate, it is a waste of everyone's  energy to keep discussing
>> potential fixes to any problem without getting the Git repos to become
>> read-write.
>> 
>> Thanks,
>> Om
>> 
>> [1] https://issues.apache.org/jira/browse/INFRA-5549
>> 

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui

Re: Finishing the Git migration - READ FIRST

[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
> client?
>
>
The links are in the JIRA ticket.  But here they are again - all browsable.


https://git-wip-us.apache.org/repos/asf/flex-falcon.git
https://git-wip-us.apache.org/repos/asf/flex-sdk.git
https://git-wip-us.apache.org/repos/asf/flex-tlf.git
https://git-wip-us.apache.org/repos/asf/flex-utilities.git

Thanks,
Om


> - Gordon
>
> -Original Message-
> From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of Om
> Sent: Tuesday, March 12, 2013 10:49 AM
> To: dev@flex.apache.org
> Subject: Finishing the Git migration - READ FIRST
>
> 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
> JIRA ticket [1]
>
> "The git repos are also read only. Please have the FLEX PMC look at the
> repos, see if they are acceptable, all branches are present, etc, and if
> found accordingly, please update this ticket and I'll make them writable."
>
> Instead of posting comments and discussing on the JIRA ticket, let us
> first come to a decision whether we are happy with the new Git repos or not.
>
> *Please respond to this thread with details on what repos are missing
> (projects, whiteboards, etc.)  *Once we have a consensus, I will post that
> list on the JIRA ticket.  Once all those Reps are migrated to Git, we can
> give INFRA the go ahead to make them all read-write.
>
> Once that is done, we can apply a fix to the SDK - TLF problem and push it
> to the repo.
>
> To re-iterate, it is a waste of everyone's  energy to keep discussing
> potential fixes to any problem without getting the Git repos to become
> read-write.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549
>

Re: Finishing the Git migration - READ FIRST

[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 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 JIRA
> ticket [1]
>
> "The git repos are also read only. Please have the FLEX PMC look at the
> repos, see if they are acceptable, all branches are present, etc, and if
> found accordingly, please update this ticket and I'll make them writable."
>
> Instead of posting comments and discussing on the JIRA ticket, let us first
> come to a decision whether we are happy with the new Git repos or not.
>
> *Please respond to this thread with details on what repos are missing
> (projects, whiteboards, etc.)  *Once we have a consensus, I will post that
> list on the JIRA ticket.  Once all those Reps are migrated to Git, we can
> give INFRA the go ahead to make them all read-write.
>
> Once that is done, we can apply a fix to the SDK - TLF problem and push it
> to the repo.
>
> To re-iterate, it is a waste of everyone's  energy to keep discussing
> potential fixes to any problem without getting the Git repos to become
> read-write.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549



--
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

RE: Finishing the Git migration - READ FIRST

[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.com [mailto:omup...@gmail.com] On Behalf Of Om
Sent: Tuesday, March 12, 2013 10:49 AM
To: dev@flex.apache.org
Subject: Finishing the Git migration - READ FIRST

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 JIRA ticket [1]

"The git repos are also read only. Please have the FLEX PMC look at the repos, 
see if they are acceptable, all branches are present, etc, and if found 
accordingly, please update this ticket and I'll make them writable."

Instead of posting comments and discussing on the JIRA ticket, let us first 
come to a decision whether we are happy with the new Git repos or not.

*Please respond to this thread with details on what repos are missing 
(projects, whiteboards, etc.)  *Once we have a consensus, I will post that list 
on the JIRA ticket.  Once all those Reps are migrated to Git, we can give INFRA 
the go ahead to make them all read-write.

Once that is done, we can apply a fix to the SDK - TLF problem and push it to 
the repo.

To re-iterate, it is a waste of everyone's  energy to keep discussing potential 
fixes to any problem without getting the Git repos to become read-write.

Thanks,
Om

[1] https://issues.apache.org/jira/browse/INFRA-5549

Re: [Git] Ignore files?

[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 hope that one day I'll understand at least every other
word of that sentence :-)

I'll try to be patient and study. But nothing I've read so far makes
me think that git isn't just another version control system, and that
it doesn't bring anything to this project that solves a problem we had
- I know of no problems with SVN - and I'm pretty sure it will
introduce problems that we never had, especially for release managers
and newbie contributors.

EdB



-- 
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Finishing the Git migration - READ FIRST

[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 JIRA
ticket [1]

"The git repos are also read only. Please have the FLEX PMC look at the
repos, see if they are acceptable, all branches are present, etc, and if
found accordingly, please update this ticket and I'll make them writable."

Instead of posting comments and discussing on the JIRA ticket, let us first
come to a decision whether we are happy with the new Git repos or not.

*Please respond to this thread with details on what repos are missing
(projects, whiteboards, etc.)  *Once we have a consensus, I will post that
list on the JIRA ticket.  Once all those Reps are migrated to Git, we can
give INFRA the go ahead to make them all read-write.

Once that is done, we can apply a fix to the SDK - TLF problem and push it
to the repo.

To re-iterate, it is a waste of everyone's  energy to keep discussing
potential fixes to any problem without getting the Git repos to become
read-write.

Thanks,
Om

[1] https://issues.apache.org/jira/browse/INFRA-5549

Re: [Git] Ignore files?

[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.

Re: [Git] relative paths in build files

[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 
> 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, 2013, at 11:37 AM, Erik de Bruin  wrote:
>
>> 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 care that the dependencies in build files
>> point to the correct branch?
>>
>> EdB
>>
>>
>>
>> --
>> 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

[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 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: [Git] Ignore files?

[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 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 reverse in time before commit and push.
> 
> Your working copy is always ready to use, even you need switch inter 
> branches, experiments, dry test, etc... 
> 
> You can use your own .gitignore until we get RW access, at this moment you 
> can remove from you stage, pretty clean all.
> 
> --
> 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, 2013, at 1:05 PM, Erik de Bruin  wrote:
> 
>> 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 different?
>> 
>> EdB
>> 
>> 
>> 
>> On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira
>>  wrote:
>>> 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 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 week where
>>> one can step changes over the other are gone thanks to branching feature.
>>> You only have to take patience to master this feature and you will see that
>>> is very powerful and get lots of control. In SVN the main problem is that
>>> all happens in one single place since branches are not usable and this
>>> causes that kind problems while working with other people.
>>> 
>>> Regarding the problem you commented about your changes not committed in
>>> your workspace. Justin and others talked about it and share solutions. Just
>>> to complement, I think you should clone the flex git repo, extract a patch
>>> from SVN with your changes and apply it to your git clone. Then I recommend
>>> to branch and commit your changes in that branch so you continue to work in
>>> your local repo. When GIT remote repo will come writeable you could push
>>> your branch to the remote repo. This will make you safe that you're not
>>> breaking anything since your branch will be isolated. When that branch will
>>> be shared remotely, Mike will be able to checkout and work in it, or fork
>>> again to make whatever experimental change he like. Then you all can plan
>>> the merge and when ready merge into develop.
>>> 
>>> Best
>>> 
>>> Carlos
>>> 
>>> 
>>> 2013/3/12 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 you have questions.
 
 Tortoise GIT is just like Tortoise SVN! Use it. :)
 
 Mike
 
 
 Quoting 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 all (sub) projects that used
> 'svn:ignore'...
> 
> EdB
> 
> 1: 
> http://gitready.com/beginner/**2009/01/19/ignoring-files.html
> 
> 
> 
> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
> wrote:
> 
>> 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 these things in the mailing list in the hope someone
>> picks them up and puts them in the Wiki. That way the hordes of
>> contributors that this move is alleged 

RE: SVN to Git migration in progress

[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 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  
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 
>
>> 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 
>>  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  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 
>> >>  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 
>> >> >  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
>>
>>

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

[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.

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"  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

[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 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

Re: SVN to Git migration in progress

[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

[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 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

[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:
 - 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: [Git] Ignore files?

[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 local gitted folder, and send that in an email if you really 
wanted (just watch out for accidentally sharing your private keys).


Kevin N.


On 3/12/13 8:05 AM, Erik de Bruin wrote:

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 different?

EdB

Re: [Git] Ignore files?

[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 develop.

I want to share the link that show you a resume of git workflow:

http://nvie.com/posts/a-successful-git-branching-model/

Take the time to understand this and you will understand the main concepts,
then you will need to  have patience and let the use increase the
experience.

> in git I do a 'push', in SVN I do a 'commit'

No. In Git you do a "commit" (to local) and then a "push" (to remote)
Mike will make a "pull" to get your changes.

GIT is distributed, SVN no. GIT has local and remote repo. SVN only remote
(and that's the main problem since all happens in a single place so you can
control what goes to develop.


2013/3/12 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 different?
>
> EdB
>
>
>
> On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira
>  wrote:
> > 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 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 week where
> > one can step changes over the other are gone thanks to branching feature.
> > You only have to take patience to master this feature and you will see
> that
> > is very powerful and get lots of control. In SVN the main problem is that
> > all happens in one single place since branches are not usable and this
> > causes that kind problems while working with other people.
> >
> > Regarding the problem you commented about your changes not committed in
> > your workspace. Justin and others talked about it and share solutions.
> Just
> > to complement, I think you should clone the flex git repo, extract a
> patch
> > from SVN with your changes and apply it to your git clone. Then I
> recommend
> > to branch and commit your changes in that branch so you continue to work
> in
> > your local repo. When GIT remote repo will come writeable you could push
> > your branch to the remote repo. This will make you safe that you're not
> > breaking anything since your branch will be isolated. When that branch
> will
> > be shared remotely, Mike will be able to checkout and work in it, or fork
> > again to make whatever experimental change he like. Then you all can plan
> > the merge and when ready merge into develop.
> >
> > Best
> >
> > Carlos
> >
> >
> > 2013/3/12 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 you have
> questions.
> >>
> >> Tortoise GIT is just like Tortoise SVN! Use it. :)
> >>
> >> Mike
> >>
> >>
> >> Quoting 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 all (sub) projects that used
> >>> 'svn:ignore'...
> >>>
> >>> EdB
> >>>
> >>> 1: http://gitready.com/beginner/**2009/01/19/ignoring-files.html<
> http://gitready.com/beginner/2009/01/19/ignoring-files.html>
> >>>
> >>>
> >>>
> >>> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
> >>> wrote:
> >>>
>  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 these things in the mailing list in the hope someone
>  picks them up and puts them in the Wiki. That way the hordes of
>  contributors that this move is alleged to bring will have easy and
>  consistent access to what I'm sure will be an extensive FAQ...
> 
>  Ok, rant over, this is my question:

Re: SVN to Git migration in progress

[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, 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 :


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
 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 


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
 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  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
>>  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
>> >  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

[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 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 

AW: SVN to Git migration in progress

[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


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
 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 
>
>> 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
>>  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  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
>> >>  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
>> >> >  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: [Git] Ignore files?

[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 
reverse in time before commit and push.

Your working copy is always ready to use, even you need switch inter branches, 
experiments, dry test, etc... 

You can use your own .gitignore until we get RW access, at this moment you can 
remove from you stage, pretty clean all.

--
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, 2013, at 1:05 PM, Erik de Bruin  wrote:

> 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 different?
> 
> EdB
> 
> 
> 
> On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira
>  wrote:
>> 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 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 week where
>> one can step changes over the other are gone thanks to branching feature.
>> You only have to take patience to master this feature and you will see that
>> is very powerful and get lots of control. In SVN the main problem is that
>> all happens in one single place since branches are not usable and this
>> causes that kind problems while working with other people.
>> 
>> Regarding the problem you commented about your changes not committed in
>> your workspace. Justin and others talked about it and share solutions. Just
>> to complement, I think you should clone the flex git repo, extract a patch
>> from SVN with your changes and apply it to your git clone. Then I recommend
>> to branch and commit your changes in that branch so you continue to work in
>> your local repo. When GIT remote repo will come writeable you could push
>> your branch to the remote repo. This will make you safe that you're not
>> breaking anything since your branch will be isolated. When that branch will
>> be shared remotely, Mike will be able to checkout and work in it, or fork
>> again to make whatever experimental change he like. Then you all can plan
>> the merge and when ready merge into develop.
>> 
>> Best
>> 
>> Carlos
>> 
>> 
>> 2013/3/12 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 you have questions.
>>> 
>>> Tortoise GIT is just like Tortoise SVN! Use it. :)
>>> 
>>> Mike
>>> 
>>> 
>>> Quoting 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 all (sub) projects that used
 'svn:ignore'...
 
 EdB
 
 1: 
 http://gitready.com/beginner/**2009/01/19/ignoring-files.html
 
 
 
 On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
 wrote:
 
> 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 these things in the mailing list in the hope someone
> picks them up and puts them in the Wiki. That way the hordes of
> contributors that this move is alleged to bring will have easy and
> consistent access to what I'm sure will be an extensive FAQ...
> 
> Ok, rant over, this is my question:
> 
> When I build the SDK (even a partial build) or FalconJx, my 'stage'
> (am I saying that correct?) ends up with a whole lot of files that I
> never saw in SVN. Do I 'ignore' these files? If so, does that affect
> the remote project/branch

Re: [Git] relative paths in build files

[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, 2013, at 11:37 AM, Erik de Bruin  wrote:

> 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 care that the dependencies in build files
> point to the correct branch?
> 
> EdB
> 
> 
> 
> --
> Ix Multimedia Software
> 
> Jan Luykenstraat 27
> 3521 VB Utrecht
> 
> T. 06-51952295
> I. www.ixsoftware.nl

Re: [Git] Ignore files?

[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 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
> *.DS_Store
>
> #Visual Studio files
> *.[Oo]bj
> *.user
> *.aps
> *.pch
> *.vspscc
> *.vssscc
> *_i.c
> *_p.c
> *.ncb
> *.suo
> *.tlb
> *.tlh
> *.bak
> *.[Cc]ache
> *.ilk
> *.log
> *.lib
> *.sbr
> *.sdf
> ipch/
> obj/
> [Bb]in
> [Dd]ebug*/
> [Rr]elease*/
> Ankh.NoLoad
>
> #Tooling
> _ReSharper*/
> *.resharper
> [Tt]est[Rr]esult*
>
> #Project files
> [Bb]uild/
>
> #Subversion files
> .svn
>
> # Office Temp Files
> ~$*
>
> #Binaries
> *.dll
> *.bin
> *.com
> *.exe
> *.jar
> *.swf
> *.swc
>
> #Compressed Files
> *.zip
> *.rar
> *.tar
>
>
>
> -Message d'origine- From: Erik de Bruin
> Sent: Tuesday, March 12, 2013 12:13 PM
> To: dev@flex.apache.org
> Subject: Re: [Git] Ignore files?
>
>
> 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 all (sub) projects that used
> 'svn:ignore'...
>
> EdB
>
> 1: http://gitready.com/beginner/2009/01/19/ignoring-files.html
>
>
>
> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin  wrote:
>>
>> 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 these things in the mailing list in the hope someone
>> picks them up and puts them in the Wiki. That way the hordes of
>> contributors that this move is alleged to bring will have easy and
>> consistent access to what I'm sure will be an extensive FAQ...
>>
>> Ok, rant over, this is my question:
>>
>> When I build the SDK (even a partial build) or FalconJx, my 'stage'
>> (am I saying that correct?) ends up with a whole lot of files that I
>> never saw in SVN. Do I 'ignore' these files? If so, does that affect
>> the remote project/branch? Do I need to 'push' this local change, like
>> I need to commit when I add a "svn:Ignore" property?
>>
>> EdB
>>
>>
>>
>> --
>> 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: [Git] Ignore files?

[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 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 different?

EdB



On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira
 wrote:

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 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 week where
one can step changes over the other are gone thanks to branching feature.
You only have to take patience to master this feature and you will see 
that

is very powerful and get lots of control. In SVN the main problem is that
all happens in one single place since branches are not usable and this
causes that kind problems while working with other people.

Regarding the problem you commented about your changes not committed in
your workspace. Justin and others talked about it and share solutions. 
Just

to complement, I think you should clone the flex git repo, extract a patch
from SVN with your changes and apply it to your git clone. Then I 
recommend
to branch and commit your changes in that branch so you continue to work 
in

your local repo. When GIT remote repo will come writeable you could push
your branch to the remote repo. This will make you safe that you're not
breaking anything since your branch will be isolated. When that branch 
will

be shared remotely, Mike will be able to checkout and work in it, or fork
again to make whatever experimental change he like. Then you all can plan
the merge and when ready merge into develop.

Best

Carlos


2013/3/12 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 you have 
questions.


Tortoise GIT is just like Tortoise SVN! Use it. :)

Mike


Quoting 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 all (sub) projects that used
'svn:ignore'...

EdB

1: 
http://gitready.com/beginner/**2009/01/19/ignoring-files.html




On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
wrote:


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 these things in the mailing list in the hope someone
picks them up and puts them in the Wiki. That way the hordes of
contributors that this move is alleged to bring will have easy and
consistent access to what I'm sure will be an extensive FAQ...

Ok, rant over, this is my question:

When I build the SDK (even a partial build) or FalconJx, my 'stage'
(am I saying that correct?) ends up with a whole lot of files that I
never saw in SVN. Do I 'ignore' these files? If so, does that affect
the remote project/branch? Do I need to 'push' this local change, like
I need to commit when I add a "svn:Ignore" property?

EdB



--
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



--
Michael Schmalle - Teoti Graphix, LLC
http://www.teotigraphix.com
http://blog.teotigraphix.com





--
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

[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, Mar 12, 2013 at 1:03 PM, Carlos Rovira
 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 
>
>> 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
>>  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  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
>> >>  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
>> >> >  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: [Git] Ignore files?

[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 different?

EdB



On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira
 wrote:
> 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 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 week where
> one can step changes over the other are gone thanks to branching feature.
> You only have to take patience to master this feature and you will see that
> is very powerful and get lots of control. In SVN the main problem is that
> all happens in one single place since branches are not usable and this
> causes that kind problems while working with other people.
>
> Regarding the problem you commented about your changes not committed in
> your workspace. Justin and others talked about it and share solutions. Just
> to complement, I think you should clone the flex git repo, extract a patch
> from SVN with your changes and apply it to your git clone. Then I recommend
> to branch and commit your changes in that branch so you continue to work in
> your local repo. When GIT remote repo will come writeable you could push
> your branch to the remote repo. This will make you safe that you're not
> breaking anything since your branch will be isolated. When that branch will
> be shared remotely, Mike will be able to checkout and work in it, or fork
> again to make whatever experimental change he like. Then you all can plan
> the merge and when ready merge into develop.
>
> Best
>
> Carlos
>
>
> 2013/3/12 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 you have questions.
>>
>> Tortoise GIT is just like Tortoise SVN! Use it. :)
>>
>> Mike
>>
>>
>> Quoting 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 all (sub) projects that used
>>> 'svn:ignore'...
>>>
>>> EdB
>>>
>>> 1: 
>>> http://gitready.com/beginner/**2009/01/19/ignoring-files.html
>>>
>>>
>>>
>>> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
>>> wrote:
>>>
 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 these things in the mailing list in the hope someone
 picks them up and puts them in the Wiki. That way the hordes of
 contributors that this move is alleged to bring will have easy and
 consistent access to what I'm sure will be an extensive FAQ...

 Ok, rant over, this is my question:

 When I build the SDK (even a partial build) or FalconJx, my 'stage'
 (am I saying that correct?) ends up with a whole lot of files that I
 never saw in SVN. Do I 'ignore' these files? If so, does that affect
 the remote project/branch? Do I need to 'push' this local change, like
 I need to commit when I add a "svn:Ignore" property?

 EdB



 --
 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
>>>
>>>
>> --
>> Michael Schmalle - Teoti Graphix, LLC
>> http://www.teotigraphix.com
>> http://blog.teotigraphix.com
>>
>>
>
>
> --
> 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

[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 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 - 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
>  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  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
> >>  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
> >> >  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: [Git] Ignore files?

[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 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 week where
one can step changes over the other are gone thanks to branching feature.
You only have to take patience to master this feature and you will see that
is very powerful and get lots of control. In SVN the main problem is that
all happens in one single place since branches are not usable and this
causes that kind problems while working with other people.

Regarding the problem you commented about your changes not committed in
your workspace. Justin and others talked about it and share solutions. Just
to complement, I think you should clone the flex git repo, extract a patch
from SVN with your changes and apply it to your git clone. Then I recommend
to branch and commit your changes in that branch so you continue to work in
your local repo. When GIT remote repo will come writeable you could push
your branch to the remote repo. This will make you safe that you're not
breaking anything since your branch will be isolated. When that branch will
be shared remotely, Mike will be able to checkout and work in it, or fork
again to make whatever experimental change he like. Then you all can plan
the merge and when ready merge into develop.

Best

Carlos


2013/3/12 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 you have questions.
>
> Tortoise GIT is just like Tortoise SVN! Use it. :)
>
> Mike
>
>
> Quoting 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 all (sub) projects that used
>> 'svn:ignore'...
>>
>> EdB
>>
>> 1: 
>> http://gitready.com/beginner/**2009/01/19/ignoring-files.html
>>
>>
>>
>> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
>> wrote:
>>
>>> 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 these things in the mailing list in the hope someone
>>> picks them up and puts them in the Wiki. That way the hordes of
>>> contributors that this move is alleged to bring will have easy and
>>> consistent access to what I'm sure will be an extensive FAQ...
>>>
>>> Ok, rant over, this is my question:
>>>
>>> When I build the SDK (even a partial build) or FalconJx, my 'stage'
>>> (am I saying that correct?) ends up with a whole lot of files that I
>>> never saw in SVN. Do I 'ignore' these files? If so, does that affect
>>> the remote project/branch? Do I need to 'push' this local change, like
>>> I need to commit when I add a "svn:Ignore" property?
>>>
>>> EdB
>>>
>>>
>>>
>>> --
>>> 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
>>
>>
> --
> Michael Schmalle - Teoti Graphix, LLC
> http://www.teotigraphix.com
> http://blog.teotigraphix.com
>
>


-- 
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

[Git] ASJS repo migration?

[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?

[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
*.DS_Store

#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad

#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*

#Project files
[Bb]uild/

#Subversion files
.svn

# Office Temp Files
~$*

#Binaries
*.dll
*.bin
*.com
*.exe
*.jar
*.swf
*.swc

#Compressed Files
*.zip
*.rar
*.tar



-Message d'origine- 
From: Erik de Bruin

Sent: Tuesday, March 12, 2013 12:13 PM
To: dev@flex.apache.org
Subject: Re: [Git] Ignore files?

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 all (sub) projects that used 
'svn:ignore'...


EdB

1: http://gitready.com/beginner/2009/01/19/ignoring-files.html



On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin  wrote:

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 these things in the mailing list in the hope someone
picks them up and puts them in the Wiki. That way the hordes of
contributors that this move is alleged to bring will have easy and
consistent access to what I'm sure will be an extensive FAQ...

Ok, rant over, this is my question:

When I build the SDK (even a partial build) or FalconJx, my 'stage'
(am I saying that correct?) ends up with a whole lot of files that I
never saw in SVN. Do I 'ignore' these files? If so, does that affect
the remote project/branch? Do I need to 'push' this local change, like
I need to commit when I add a "svn:Ignore" property?

EdB



--
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: [Git] Ignore files?

[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/committed/staged something to wherever it needs
to go for you and others to enjoy, we won't know that for sure ;-)

EdB


On Tue, Mar 12, 2013 at 12:18 PM, Michael Schmalle
 wrote:
> 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 you have questions.
>
> Tortoise GIT is just like Tortoise SVN! Use it. :)
>
> Mike
>
>
> Quoting 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 all (sub) projects that used
>> 'svn:ignore'...
>>
>> EdB
>>
>> 1: http://gitready.com/beginner/2009/01/19/ignoring-files.html
>>
>>
>>
>> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin 
>> wrote:
>>>
>>> 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 these things in the mailing list in the hope someone
>>> picks them up and puts them in the Wiki. That way the hordes of
>>> contributors that this move is alleged to bring will have easy and
>>> consistent access to what I'm sure will be an extensive FAQ...
>>>
>>> Ok, rant over, this is my question:
>>>
>>> When I build the SDK (even a partial build) or FalconJx, my 'stage'
>>> (am I saying that correct?) ends up with a whole lot of files that I
>>> never saw in SVN. Do I 'ignore' these files? If so, does that affect
>>> the remote project/branch? Do I need to 'push' this local change, like
>>> I need to commit when I add a "svn:Ignore" property?
>>>
>>> EdB
>>>
>>>
>>>
>>> --
>>> 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
>>
>
> --
> Michael Schmalle - Teoti Graphix, LLC
> http://www.teotigraphix.com
> http://blog.teotigraphix.com
>



--
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Re: SVN to Git migration in progress

[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 - 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
 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  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
>>  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
>> >  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: [Git] Ignore files?

[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 you have  
questions.


Tortoise GIT is just like Tortoise SVN! Use it. :)

Mike

Quoting 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 all (sub) projects that used  
'svn:ignore'...


EdB

1: http://gitready.com/beginner/2009/01/19/ignoring-files.html



On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin  wrote:

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 these things in the mailing list in the hope someone
picks them up and puts them in the Wiki. That way the hordes of
contributors that this move is alleged to bring will have easy and
consistent access to what I'm sure will be an extensive FAQ...

Ok, rant over, this is my question:

When I build the SDK (even a partial build) or FalconJx, my 'stage'
(am I saying that correct?) ends up with a whole lot of files that I
never saw in SVN. Do I 'ignore' these files? If so, does that affect
the remote project/branch? Do I need to 'push' this local change, like
I need to commit when I add a "svn:Ignore" property?

EdB



--
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



--
Michael Schmalle - Teoti Graphix, LLC
http://www.teotigraphix.com
http://blog.teotigraphix.com

Re: SVN to Git migration in progress

[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 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
>  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
> >  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: [Git] Ignore files?

[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 all (sub) projects that used 'svn:ignore'...

EdB

1: http://gitready.com/beginner/2009/01/19/ignoring-files.html



On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin  wrote:
> 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 these things in the mailing list in the hope someone
> picks them up and puts them in the Wiki. That way the hordes of
> contributors that this move is alleged to bring will have easy and
> consistent access to what I'm sure will be an extensive FAQ...
>
> Ok, rant over, this is my question:
>
> When I build the SDK (even a partial build) or FalconJx, my 'stage'
> (am I saying that correct?) ends up with a whole lot of files that I
> never saw in SVN. Do I 'ignore' these files? If so, does that affect
> the remote project/branch? Do I need to 'push' this local change, like
> I need to commit when I add a "svn:Ignore" property?
>
> EdB
>
>
>
> --
> 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: [DISCUSS] Apache Flex SDK Installer 2.5 RC1

[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 from this tickect 
> https://issues.apache.org/jira/browse/INFRA-5549 [1], so, I'm going to wait 
> everything is ok and writable before I try to loose everything.
> 
> -Fred
> 
> [1]
> I've migrated the repos as follows:
> https://git-wip-us.apache.org/repos/asf/flex-falcon.git
> https://git-wip-us.apache.org/repos/asf/flex-sdk.git
> https://git-wip-us.apache.org/repos/asf/flex-tlf.git
> https://git-wip-us.apache.org/repos/asf/flex-utilities.git
> 
> I have not migrated whiteboard or site. (site will stay SVN, and be writable 
> after we're finished with this.)
> I am open to moving whiteboard, but you'll have to tell me explicitly that 
> you want to move it - otherwise when we are done I'll make both site and 
> whiteboard writable in SVN.
> 
> The git repos are also read only. Please have the FLEX PMC look at the repos, 
> see if they are acceptable, all branches are present, etc, and if found 
> accordingly, please update this ticket and I'll make them writable.
> 
> -Message d'origine- From: Frédéric THOMAS
> Sent: Tuesday, March 12, 2013 7:26 AM
> To: dev@flex.apache.org
> Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> 
> Just to be sure, what's the exact address for the develop branch ?
> 
> http://git.apache.org/flex-sdk.git or http://github.com/apache/flex-sdk or
> that the same pointer ?
> 
> -Fred
> 
> -Message d'origine- From: Justin Mclean
> Sent: Tuesday, March 12, 2013 7:10 AM
> To: dev@flex.apache.org
> Subject: Re: [DISCUSS] Apache Flex SDK Installer 2.5 RC1
> 
> Hi,
> 
>> Then what's the process to move SCM w/o to loose anything ?
> 
> 
> Best way I think is to do a full git clone in a new area, create a patch in
> SVN and then reapply that patch to the new git repo just trying that now.
> Anyone have any other ideas?
> 
> Justin
> 

Re: SVN to Git migration in progress

[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-sdk git repo compiles a usable SDK 
if you work around the TLF issue.


Justin 

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

[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 frameworks\projects\apache\bundles\pt_PT\apache.properties contains 
> no entries
> ---
>
> Key: FLEX-33345
> URL: https://issues.apache.org/jira/browse/FLEX-33345
> Project: Apache Flex
>  Issue Type: Improvement
>  Components: i18n : Bundle Support
>Affects Versions: Apache Flex 4.9.0
>Reporter: Wilson Silva
>Assignee: Justin Mclean
>Priority: Minor
> Fix For: Apache Flex Next
>
> Attachments: apache.properties
>
>
> I've attached the translation. Also, I'm going through all the pt_PT resource 
> files to see what's missing and what may be wrong and I see that there is 
> still some work that needs to be done. Is there a better way to contribute 
> these translations, instead of opening issues on Jira?

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Re: SVN to Git migration in progress

[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.
>
> Justin



--
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

[Git] relative paths in build files

[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 care that the dependencies in build files
point to the correct branch?

EdB



--
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Re: SVN to Git migration in progress

[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
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

[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

[Git] Ignore files?

[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 these things in the mailing list in the hope someone
picks them up and puts them in the Wiki. That way the hordes of
contributors that this move is alleged to bring will have easy and
consistent access to what I'm sure will be an extensive FAQ...

Ok, rant over, this is my question:

When I build the SDK (even a partial build) or FalconJx, my 'stage'
(am I saying that correct?) ends up with a whole lot of files that I
never saw in SVN. Do I 'ignore' these files? If so, does that affect
the remote project/branch? Do I need to 'push' this local change, like
I need to commit when I add a "svn:Ignore" property?

EdB



--
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Re: SVN to Git migration in progress

[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 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

[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 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
 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

[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, 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

[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? Excellent!

EdB



On Tue, Mar 12, 2013 at 10:55 AM, Justin Mclean
 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

[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 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

[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

[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 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

[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: 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

[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, 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

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

[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.properties contains 
> no entries
> ---
>
> Key: FLEX-33345
> URL: https://issues.apache.org/jira/browse/FLEX-33345
> Project: Apache Flex
>  Issue Type: Improvement
>  Components: i18n : Bundle Support
>Affects Versions: Apache Flex 4.9.0
>Reporter: Wilson Silva
>Assignee: Justin Mclean
>Priority: Minor
> Fix For: Apache Flex Next
>
> Attachments: apache.properties
>
>
> I've attached the translation. Also, I'm going through all the pt_PT resource 
> files to see what's missing and what may be wrong and I see that there is 
> still some work that needs to be done. Is there a better way to contribute 
> these translations, instead of opening issues on Jira?

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira