Can I get a ruling on two scenarios? The first is in [1].
There are links to patch files on GitHub like this [2]. Is this a
"permanent" link? Does it matter if it isn't?
Similarly, another contribution came in via the mailing list with a dropbox
URL like this: [3].
Is this insufficient becaus
On Mon, Aug 20, 2012 at 1:46 PM, Jeff Conrad wrote:
> > I thought when we made the "develop" branch in SVN it didn't show up in
> the
> > GitHub mirror.
>
> The GitHub mirror has been off since the svn restructuring. We
> essentially took one SVN repository with a branches, tags, and trunk
> and
great move! I wasn't aware of this! :)
2012/8/20 Jeff Conrad
> > I thought when we made the "develop" branch in SVN it didn't show up in
> the
> > GitHub mirror.
>
> The GitHub mirror has been off since the svn restructuring. We
> essentially took one SVN repository with a branches, tags, and t
> I thought when we made the "develop" branch in SVN it didn't show up in the
> GitHub mirror.
The GitHub mirror has been off since the svn restructuring. We
essentially took one SVN repository with a branches, tags, and trunk
and turned it into 6+. I totally agreed with that move, and I'm glad
On 8/20/12 12:56 PM, "Om" wrote:
>>>
>>> No. Any branching would be updated in the next github mirror refresh.
>> Has this been verified? It isn't true for SVN branching.
>>
> Why do you say that it is not true for SVN branching?
>
> Om
I thought when we made the "develop" branch in SVN
Right! We are looking for people with completly freedom since this would
make make things move forward in the project due to remove barriers and
allow contributions flow.
The fear that at sometime apache flex official project will be cloacked by
a more successful fork will always be possible. Righ
On Mon, Aug 20, 2012 at 12:43 PM, Alex Harui wrote:>
> > 1. Make a patch of ApacheFlexContributorA codebase and attach it to a
> JIRA
> > ticket. In the JIRA ticket the CLA of only Contributor A is sufficient.
> Has Apache ruled that this is the case?
>
That is what I got from the various JIR
On 8/20/12 12:21 PM, "Om" wrote:
>
> The one cool thing about GitHub lets me easily host my personal project on
> a publicly available repository. Take this scenario for example:
>
> Contributor A has an idea for a feature. He forks ApacheFlex on Github
> into ApacheFlexContributorA
> He
This seems like a great way to manage changes to Flex while giving people
complete freedom to fiddle with it. The danger can come, at some point in
the future, from git repositories that contain features not compatible
with Apache Flex. I would think this could be handled by making sure
Apache Flex
You understand perfectly Peter :)
2012/8/20 Peter Ent
> If I mayŠ
>
> 1. Have Apache Git be the origin for Apache Flex (including branches that
> are official).
> 2. Use GitHub to mirror and for additional work and features. This lets
> the community do as the please to explore and modify, test,
On Mon, Aug 20, 2012 at 11:43 AM, Alex Harui wrote:
>
>
>
> On 8/20/12 11:34 AM, "Om" wrote:
>
> >>
> >> What would be the steps to integrate a proposed change if we didn't use
> >> GitHub and we retired the GitHub mirror?
> >>
> >
> > I am sorry, but why would we want to retire the GitHub mirro
Github has a feature called pull requests that an Apache Flex Git repo does not.
https://help.github.com/articles/using-pull-requests
It's essentially a code review process layer on top of git.
It allows us to fork Apache Flex… make modifications then send a pull request
to the main apache repo
Complete agree with you Peter, this way was I said... :)
Sent from my iPad
On 20/08/2012, at 20:58, Peter Ent wrote:
> If I mayŠ
>
> 1. Have Apache Git be the origin for Apache Flex (including branches that
> are official).
> 2. Use GitHub to mirror and for additional work and features. This le
If I mayŠ
1. Have Apache Git be the origin for Apache Flex (including branches that
are official).
2. Use GitHub to mirror and for additional work and features. This lets
the community do as the please to explore and modify, test, enhance, etc.
3. Committers perform the integration from GitHub to
On 8/20/12 11:34 AM, "Om" wrote:
>>
>> What would be the steps to integrate a proposed change if we didn't use
>> GitHub and we retired the GitHub mirror?
>>
>
> I am sorry, but why would we want to retire the GitHub mirror? Right now,
> it is read-only. If we leave it like that, the comm
Hi Om,
while googling how others make and focus on things with github - apache and
so on...I see this post :
http://www.mikealrogers.com/posts/apache-considered-harmful.html
worth a read by anyone here at least to be informed of internal things at
apache that many of us, new to the internals doe
On Mon, Aug 20, 2012 at 11:34 AM, Om wrote:
> On Mon, Aug 20, 2012 at 11:23 AM, Alex Harui wrote:
>
>>
>>
>>
>> On 8/20/12 11:01 AM, "Carlos Rovira"
>> wrote:
>>
>> > Hi Alex,
>> >
>> > when we get the official repo in Apache we'd not need to have github,
>> but
>> > if you use it or not it wou
On Mon, Aug 20, 2012 at 11:23 AM, Alex Harui wrote:
>
>
>
> On 8/20/12 11:01 AM, "Carlos Rovira"
> wrote:
>
> > Hi Alex,
> >
> > when we get the official repo in Apache we'd not need to have github, but
> > if you use it or not it would not be important. Git is "distributed" so
> > unlike SVN yo
See the "Merging a Pull Request" section near the bottom of this page:
https://help.github.com/articles/using-pull-requests
The difference would be that you'd be pushing back to apache.org and the user
who opened the pull request would need to close it themselves.
--Dasa
On Aug 20, 2012, at 11:
On 8/20/12 11:01 AM, "Carlos Rovira" wrote:
> Hi Alex,
>
> when we get the official repo in Apache we'd not need to have github, but
> if you use it or not it would not be important. Git is "distributed" so
> unlike SVN you always have a "distributed" full repo. The one at apache
> will be th
Hi Om,
I was making pull request and moving the github thing due to the fact that
until we don't have apache git write access is the easiest way to get GBM
routed vía github and the integrated to SVN. What do you think about it?
If you think is not the way we could go try another
Best,
Carlos
Hi Michael,
as Jose Barragan told us in a response in this thread it seems we don't
need such branch. I must said that we, at work, didn't need such branch.
I think the first problem to solve here is to get write access to the
github apache flex repo. You as PPMC could see why apache flex repo do
On Mon, Aug 20, 2012 at 11:01 AM, Carlos Rovira <
carlos.rov...@codeoscopic.com> wrote:
> Hi Alex,
>
> when we get the official repo in Apache we'd not need to have github, but
> if you use it or not it would not be important. Git is "distributed" so
> unlike SVN you always have a "distributed" fu
Hi Alex,
when we get the official repo in Apache we'd not need to have github, but
if you use it or not it would not be important. Git is "distributed" so
unlike SVN you always have a "distributed" full repo. The one at apache
will be the so called "origin" and well all flows will converge, but th
>The issue is how do we change github pull requests into SVN commits and
>hopefully with a minimum amount of steps/minimal extra work required. If
>anyone has any ideas please speak up.
Justin,
What if we maintained a git branch which had the .svn files checked in already.
The process would t
>That would be much appreciated. As someone who is just 1/3 of the way thru
>the git-hub book I am completely lost by this discussion. At this point, only
>if there were very clear instructions with relatively few >steps would I be
>interested in committing a patch for someone.
Once we get a
On 8/20/12 9:51 AM, "Carlos Rovira" wrote:
> Hi Carol,
>
> my recomendation is that you make a user in github, then make a fork of
> apache flex mirror in your user, and finaly start playing with all the
> things git and github can give you, so you end understanding the sharing
> and communit
Hi Carol,
my recomendation is that you make a user in github, then make a fork of
apache flex mirror in your user, and finaly start playing with all the
things git and github can give you, so you end understanding the sharing
and community driven philosophy behind all this stuff.
Thanks
2012/8/
Maybe git-svn would work?
http://www.google.com/search?q=git+svn+workflow
On Aug 20, 2012, at 8:29 AM, Justin Mclean wrote:
> The issue is how do we change github pull requests into SVN commits and
> hopefully with a minimum amount of steps/minimal extra work required. If
> anyone has any ide
On 8/20/12 11 :56AM, "Omar Gonzalez" wrote:
>>
>> I understand the answer is not in the book but first I have to learn
>>what
>> pull and push requests are.
>>
>> Carol
>>
>>
>Just to add some clarity to these two terms, sorry if you already know.
>
>First, there is no such thing as a push requ
>
> I understand the answer is not in the book but first I have to learn what
> pull and push requests are.
>
> Carol
>
>
Just to add some clarity to these two terms, sorry if you already know.
First, there is no such thing as a push request, there are only pull
requests.
A pull request is not th
On 8/20/12 11 :29AM, "Justin Mclean" wrote:
>Hi,
>
>> That would be much appreciated. As someone who is just 1/3 of the way
>> thru the git-hub book I am completely lost by this discussion.
>
>My guess is that the answer is not in the github book (just as the
>gitflow docs are for Git not SVN)
On Mon, Aug 20, 2012 at 8:29 AM, Justin Mclean wrote:
> Hi,
>
> > That would be much appreciated. As someone who is just 1/3 of the way
> > thru the git-hub book I am completely lost by this discussion.
>
> My guess is that the answer is not in the github book (just as the gitflow
> docs are for
Hi,
> That would be much appreciated. As someone who is just 1/3 of the way
> thru the git-hub book I am completely lost by this discussion.
My guess is that the answer is not in the github book (just as the gitflow docs
are for Git not SVN) but that's what got voted for so that's what we need
On 8/17/12 11 :30PM, "labri...@digitalprimates.net"
wrote:
>>Maybe Michael Labriola or Om could support us here...
>
>Let me catch up on the thread and try to help out tomorrow.
That would be much appreciated. As someone who is just 1/3 of the way
thru the git-hub book I am completely lost by
@Thanks Michael, you're welcome :)
I fix the encoding using UTF8 from Eclipse, removed the pull request and
create another one:
https://github.com/apache/flex/pull/3
Thanks Justin for let me know about the problem!
Carlos
PD: I will be this weekend off with limited access to 3G and computer. S
>Maybe Michael Labriola or Om could support us here...
Let me catch up on the thread and try to help out tomorrow.
Mike
Hi,
> If you have read/write access on github official mirror you can have your
> local apache flex copy receiving from Git/GitHub and updating the SVN
> (making each SCM ignore files from the other SCM).
Also I don't think that's way to go and the 2 are not in 100% sync it would
probably lead to
Hi,
> So that should be pretty simple for you, isn't it?
One we are using git 100% sure but that is probably months away.
What do we do until then? Say all patches must be supplied in SVN (not Git)
patch format and we don't accept Git pull requests?
I'm trying to work out a step by step process
Hi Justin,
ok, now all seems to be possible again, you had me scared! ;)
If you have read/write access on github official mirror you can have your
local apache flex copy receiving from Git/GitHub and updating the SVN
(making each SCM ignore files from the other SCM).
So that should be pretty sim
Hi,
> This is the key point here...The official Apache Flex Github Mirror should
> has read/write access for PPMC.
It's generated from the SVN repo so in you way it's read write but you have to
commit to SVN. This is likely to be the case for several months at least.
Thanks,
Justin
Hi Justin,
This is the key point here...The official Apache Flex Github Mirror should
has read/write access for PPMC. I can't understand why it's not... this
should be moved by Apache Flex Team since it has no sense to have a mirror
like this in read only mode. I'm missing something? maybe there's
Many thanks Om,
I think I could not do it more here since I'm not committer. I'll be
spending the following days learning Mustella to help with fix test.
Thanks!
2012/8/18 Om
> I will be head first into releasing InstallApacheFlex over the next few
> days. I can help out with the move to Gi
Hi,
> As Bertrand said in his mail contributors does not need to attach the patch
> in JIRA (this is the classic apache style).
A link to the patch/pull request is fine however it is nice to see what the
changes are. Try and be nice to committers you want them to apply your patches
right?
> I k
Hi Om,
I think the way Jose and I are requesting is not making a patch from the
pull request. We are proposing to have a local repo where can receive the
pull request and test the patch (since every committer is responsible to
verify the patch from a contributor), and then if it's ok with the resu
On Aug 17, 2012 4:27 PM, "Carlos Rovira"
wrote:
>
> Hi Justin,
>
> the point with this patch is to test the github pull request feature
> (although is a valid patch, is really a trivial patch with few changes).
If
> this works, contribution will be very easy for all of us (non committers).
> As Be
Hi Omar,
Hope you could help us with this issue and find a quick way to make it real.
Thanks!
2012/8/18 Omar Gonzalez
>
> I've been meaning to play with this but I've been out of town on a biz trip
> so it's been a little difficult finding time this week. I should get back
> to a 'normal' sch
Hi Justin,
the point with this patch is to test the github pull request feature
(although is a valid patch, is really a trivial patch with few changes). If
this works, contribution will be very easy for all of us (non committers).
As Bertrand said in his mail contributors does not need to attach t
Hi,
> Maybe this helps:
> http://codeprairie.net/blogs/chrisortman/archive/2008/01/14/creating-subversion-patches-with-git.aspx
> http://www.mail-archive.com/dev@trafficserver.apache.org/msg00864.html
Both look possible/promising.
> I am not sure how easy it will be to add such a tool/process in
Hi Justin,
I did it yet successfully on my own fork, as you can see there
https://github.com/pepebarragan on my last activity.
The following steps would be, to have properly config my working-copy with svn
(excluding config to each other) and commit normally.
Or copying these alter or news fil
On Fri, Aug 17, 2012 at 3:13 PM, Justin Mclean wrote:
> HI,
>
> > later merge or move the change over svn-integration branch
> That is the issue it's not straightforward to do as the diffs have
> slightly different formats so you can't just create a patch from git and
> apply it to SVN. I've not f
On Friday, August 17, 2012, Justin Mclean wrote:
> HI,
>
> > later merge or move the change over svn-integration branch
> That is the issue it's not straightforward to do as the diffs have
> slightly different formats so you can't just create a patch from git and
> apply it to SVN. I've not found
HI,
> later merge or move the change over svn-integration branch
That is the issue it's not straightforward to do as the diffs have slightly
different formats so you can't just create a patch from git and apply it to
SVN. I've not found a way to do this yet.
Thanks,
Justin
Hi Justin,
You only need a local working-copy of official apache/flex and GitHub owner
access over it, later apply the pull-request commit in you local copy into a
topic branch for this issue, if all works fine, accept the pull-request in
GitHub, and update de official develop branch from there
Hi,
Again no path file which means I have to generate one myself. Worse case it
seems that git patch files are not compatible with SVN patch file so I'm still
unable to apply the patch. I could hand create or re do the changes in SVN but
that's going to get tedious fast for anything but trivial
Hi,
> http://infotexture.net/2010/02/git-to-svn-and-back-again/
Interesting but not sure it solves the current issue. Ie What is the simplest
way to get a Git pul request into SVN.
Thanks,
Justin
I forgot the most important (although I put in the JIRA comment)
The link to my pull resquest for the locale branch is this:
https://github.com/apache/flex/pull/2
:)
Carlos
2012/8/17 Carlos Rovira
> Hi Justin,
>
> I comment in the JIRA ticket (
> https://issues.apache.org/jira/browse/FLEX-33
Hi Justin,
I comment in the JIRA ticket (
https://issues.apache.org/jira/browse/FLEX-33171?focusedCommentId=13436908#comment-13436908
)
but want to let you know that following the links provided by Bertrand
about CouchDb (a successful project using Git) I see the problem. I remove
the pull reques
2012/8/17 Bertrand Delacretaz
> http://wiki.apache.org/couchdb/CommitPolicy has additional info about
> this (and http://wiki.apache.org/couchdb/ContributorWorkflow but
> that's for an Apache project that's already using Git as their main
> ASF repository).
>
> -Bertrand
>
Hi Bertrand,
great li
On Fri, Aug 17, 2012 at 7:43 AM, Bertrand Delacretaz
wrote:
> Note also two things related to that:
Thanks, Bertrand. I knew something didn't quite feel right about
committers going to github to look up patches, but I couldn't quite
figure out what was bothering me.
Greg
>>"The PPMC team members can checkout an entire remote branch of comunity
>> members from github, and having reviewed and accepted all work, push the
>> new branch against the official apache repository."
> Oh I wish it was that easy :-) You need to merge then generate and apply a
>
On Fri, Aug 17, 2012 at 2:29 PM, Justin Mclean wrote:
> ...I could look up your github username, see that your've made a pull
> request, generate
> the patch myself and then apply to SVN but that's a fair of work and more
> importantly
> other people don't get to see and review the patch in JIRA
Hi,
>"The PPMC team members can checkout an entire remote branch of comunity
> members from github, and having reviewed and accepted all work, push the
> new branch against the official apache repository."
Oh I wish it was that easy :-) You need to merge then generate and apply a
pa
Hi
> since I made a pull request from github I thought attach a patch was not
> needed.
Yes you made a pull request but you need to at least refer to that in the JIRA
ticket.
Committers for the most part (like you I assume) do this in their own free time
so you want to make it easy for them, p
Carlos, Jose,
Thank you for you patience, I think I get it now ;-)
EdB
On Fri, Aug 17, 2012 at 1:50 PM, Jose Barragan
wrote:
> Hi Erik,
>
> In my own experience, those dragons are mere lizards as you said, because i'm
> always use more than one local repository for integration business
>
> I
Hi Erik,
In my own experience, those dragons are mere lizards as you said, because i'm
always use more than one local repository for integration business
IOW, i've an SVN repo and other GIT repo, the GIT repo has a local integration
branch called svn-integration, and i'm move the specific chang
We didn't see any dragons, even no lizards around ;)
Take into account that you only have two SCMs watching the same repo and
ignoring the key files on the other. In Git all happens in .git, and the
rest are your project files and folders. Take into account that empty
folders in GIT are no tracked
Carlos,
>1. In Subversion, add .git to the svn:ignore properties (or global
>ignore).
>2. Tell Git to exclude .svn/ folders with .gitignore, or set the
>core.excludesfile property in your global Git config.
>
> This is what we did at work.
The article continues: "At least in theor
To avoid things from svn goes to git and viceversa these are the key 2
points in the article you posted:
1. In Subversion, add .git to the svn:ignore properties (or global
ignore).
2. Tell Git to exclude .svn/ folders with .gitignore, or set the
core.excludesfile property in your glob
Ok, I think I got it. Some Googling brought me this:
http://infotexture.net/2010/02/git-to-svn-and-back-again/
That's what you are proposing, correct? I'm asking, because it seems
rather involved and prone to 'poisoning' either repository with the
little bits and pieces that the other VCS uses to
Yes Erik, that's the point. They can control incomings from GIT and bypass
to SVN.
2012/8/17 Erik de Bruin
> Jose,
>
> Am I correct when I say that a PPMC member in this scenario has a
> working copy that is controlled BOTH by git AND svn? So he can pull
> changes using git and then commit the
Thats it, IMHO is the only way for now, even they should have a local topic
branch called "-svn", like an integration branch to use for commits to SVN
repo.
On Aug 17, 2012, at 12:31 PM, Erik de Bruin wrote:
> Jose,
>
> Am I correct when I say that a PPMC member in this scenario has a
>
Jose,
Am I correct when I say that a PPMC member in this scenario has a
working copy that is controlled BOTH by git AND svn? So he can pull
changes using git and then commit them using svn?
EdB
On Fri, Aug 17, 2012 at 12:17 PM, Jose Barragan
wrote:
> Hi Erik,
>
> The PPMC team will be able to
Hi Erik,
The PPMC team will be able to use Git to analyze and to compare against of
apache RO repository, for this, the working-copy must furthermore agree with
“trunk” SVN and with the branch “develop” of its Git equivalent. That way they
are possible freely to be used the Git branches on my u
Hi Erik,
I understand what you say and I'm trying to give you and others as many
information as possible and to respond to questions about GIT to help get
most of us up and running with GBM and GIT, and proposing ways to overcome
the difficulties in Apache INFRA while we get full git support.
I m
Carlos,
I did read the thread before posting, but clearly I didn't understand
all that was said. I got through the first posts stating 'read-only ->
do patches in Jira', but got confused later on, apparently.
The people used to the Git model should show a little patience towards
us 'old-school' S
Hi Erik,
yes, please read the response from Jose Barragán in this thread (the third
one)
"The PPMC team members can checkout an entire remote branch of comunity
members from github, and having reviewed and accepted all work, push
the
new branch against the official apache reposito
Hi,
According to "http://git.apache.org/"; the Apache Git mirrors are
'read-only'. To me that means that you can clone them at will, but
that in order to get the changes you made to your branch into the code
base, you need to create a patch from Git and apply that to the SVN
repository... Am I mis
Hi Justin,
since I made a pull request from github I thought attach a patch was not
needed.
I just made one and attached to the ticket.
This will be need always with new model? these seems totaly unnecesary with
the mechanishm of pull request...you have all the tools to evaluate, isn't
it? I thi
Hi,
> I open a JIRA ticket and made the pull request from my forked repository in
> github to apache flex github repository.
Perhaps I'm missing something but there no patch in JIRA that I can see.
Thanks,
Justin
Hi Justin,
good question. Hope Alex, Carol and others could embrace the new model and
experiment a little with GBM here.
I just created my first JIRA ticket. Is a little ticket regarding spanish
locale for apache.swc
The idea is to test the pull request with a patch tiny but valid (only 3
files m
HI,
> People only need to work and submit valid patches via pull request as Jose
> says, PPMC are
> the final team that approve/disapprove contributions.
So I guess the question now is should current committers work this way or
directly with SNV?
Thanks,
Justin
For me that's the way to go. Simple and community driven. People only need
to work and submit valid patches via pull request as Jose says, PPMC are
the final team that approve/disapprove contributions. This will be the best
way to gain as much contributions as possible.
2012/8/16 Jose Barragán
Hi,
3.- Could we work in GBM voted option (9#) in GitHub while Apache Flex GIT
support comes?
You can but it's not perfect. You can't do pull requests and can't commit
branches. You need to create patches, put in JIRA and commit via SVN.
The PPMC team members can checkout an entire remote branc
Hi,
> 2.- Is some daemon syncing with the main SVN?
Basically yes. Occasionally it seem a little out of sync but its mostly up to
date.
> 3.- Could we work in GBM voted option (9#) in GitHub while Apache Flex GIT
> support comes?
You can but it's not perfect. You can't do pull requests and can't
Hi,
I could like to know more about the mirror of apache flex in github:
https://github.com/apache/flex
1.- Who was the creator/maintainer?
2.- Is some daemon syncing with the main SVN?
3.- Could we work in GBM voted option (9#) in GitHub while Apache Flex GIT
support comes?
(I&#
86 matches
Mail list logo
