Return-Path: X-Original-To: apmail-struts-dev-archive@www.apache.org Delivered-To: apmail-struts-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9D9D1095B for ; Wed, 16 Oct 2013 08:50:36 +0000 (UTC) Received: (qmail 94034 invoked by uid 500); 16 Oct 2013 08:50:36 -0000 Delivered-To: apmail-struts-dev-archive@struts.apache.org Received: (qmail 93942 invoked by uid 500); 16 Oct 2013 08:50:36 -0000 Mailing-List: contact dev-help@struts.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list dev@struts.apache.org Received: (qmail 93933 invoked by uid 99); 16 Oct 2013 08:50:35 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 08:50:35 +0000 Received: from localhost (HELO mail-pd0-f172.google.com) (127.0.0.1) (smtp-auth username lukaszlenart, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 08:50:34 +0000 Received: by mail-pd0-f172.google.com with SMTP id z10so579446pdj.17 for ; Wed, 16 Oct 2013 01:50:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; bh=DcmOqjn3Kqq0gzynWDkJbA6M+hJH22AacxrhghwagFE=; b=aY/e4vygnWqp10xxH0H3zZP08CBP42tzWEiGFmuMPF/9hdgRZ7GgULWvNiKlGj7D8n +f4WXkagMQnM/lJJl249FLkf/+yk0r/zCMs17za/zopNRfSSpp69Ql4acWNXVO5rHlyS wN0mZOU916Sxy1QwDlbGgLtg4XVkZGa3CM+sCyw9KXGAlWVlJcVNa7rroEFLsEq4GU2e NACDoSo5UcUiRMEl5Jt1KGYfRagV8YQpXmLHD2t9646naBymIQpP3aJ2SwEkwZdFEjlh mUmvwQEP49CVQCdmoSWGUjWuppupMrG/MTQ31Zq8t7wxZjj6D8gDA8i+OKTve+bKYc5D jQpg== X-Received: by 10.68.198.68 with SMTP id ja4mr1797612pbc.24.1381913434282; Wed, 16 Oct 2013 01:50:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.20.169 with HTTP; Wed, 16 Oct 2013 01:50:14 -0700 (PDT) In-Reply-To: <52397E0C.2060305@gmail.com> References: <5232BAE9.5040804@gmail.com> <5238A9FE.7030503@gmail.com> <5238C456.3000702@gmail.com> <52397E0C.2060305@gmail.com> From: Lukasz Lenart Date: Wed, 16 Oct 2013 10:50:14 +0200 Message-ID: Subject: Re: Svn to Git migration To: Struts Developers List Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable As far as I know, SvnPubSub doesn't support Git right now. So we can migrate struts2/trunk to Git but the rest must stay as is. And if we plan to migrate/create new user guide, it will be hosted via Subversion. Any doubts? Regards --=20 =C5=81ukasz + 48 606 323 122 http://www.lenart.org.pl/ 2013/9/18 Rene Gielen : > +1 > > Am 18.09.13 11:38, schrieb Lukasz Lenart: >> When 2.3.15.2 will be officially out, I want to send request to Infra >> for Svn to Git migration >> >> 2013/9/17 Christian Grobmeier : >>> thats fine :-) Now as we have that agreement, let's keep us moving :) >>> >>> Am 17.09.13 22:48, schrieb Rene Gielen: >>>> I just wanted to get this clarified. Seems like we have an agreement := -) >>>> Am 17.09.2013 21:14 schrieb "Christian Grobmeier" : >>>> >>>>> Am 17.09.13 21:06, schrieb Johannes Geppert: >>>>>>> -1 for moving trunk only. We don't want to lose history, and we wou= ld >>>>>>> not want two repositories for one project (Struts 2). Once we moved= to >>>>>>> git, the full struts2 svn tree should either be switched to read-on= ly >>>>>>> or/and later be removed. >>>>>> >>>>>> Sure you are right the history should not be lost. >>>>>> What I mean is not to migrate the struts1, archive, sandbox >>>>>> and site into the new struts.git repository. >>>>> >>>>> You speak of different things. >>>>> >>>>> This is not to migrate: >>>>> http://svn.apache.org/repos/asf/struts/ >>>>> and I believe Jo is against migrating the content of all of that. I >>>>> agree with him. >>>>> >>>>> We need to migrate this: >>>>> >>>>> http://svn.apache.org/repos/asf/struts/struts2/ >>>>> including branches (there are non in short time), tags and trunk. >>>>> >>>>> I bet you are on the same page here. >>>>> >>>>> >>>>>> >>>>>> Johannes >>>>>> >>>>>> ################################################# >>>>>> web: http://www.jgeppert.com >>>>>> twitter: http://twitter.com/jogep >>>>>> >>>>>> >>>>>> >>>>>> 2013/9/13 Rene Gielen >>>>>> >>>>>>> +1 for git flow as the way to go, including excellent tooling - com= mand >>>>>>> line extensions, Atlassian Sourcetree support and even a IDEA plugi= n >>>>>>> (https://github.com/OpherV/gitflow4idea) help to make this an elega= nt >>>>>>> abstract and reliable workflow. >>>>>>> >>>>>>> -1 for moving trunk only. We don't want to lose history, and we wou= ld >>>>>>> not want two repositories for one project (Struts 2). Once we moved= to >>>>>>> git, the full struts2 svn tree should either be switched to read-on= ly >>>>>>> or/and later be removed. >>>>>>> >>>>>>> +1 for dealing with ../branches/STRUTS_3_X etc as hierarchical feat= ure >>>>>>> branches from which single feature branches will be forked for actu= al >>>>>>> development - at least for now. I want to investigate further on th= is >>>>>>> one, but basically there should not be a problem if we start like t= his. >>>>>>> >>>>>>> - Ren=C3=A9 >>>>>>> >>>>>>> Am 12.09.13 21:48, schrieb Johannes Geppert: >>>>>>>> +1 for starting with the Git migration process. >>>>>>>> >>>>>>>> What about only migrating the current svn struts2/trunk to git and >>>>> leave >>>>>>>> the rest in the svn repository? >>>>>>>> >>>>>>>> If we need sometime also the site in git we can request a separate= git >>>>>>>> repository like struts-site.git. >>>>>>>> >>>>>>>> Johannes >>>>>>>> >>>>>>>> ################################################# >>>>>>>> web: http://www.jgeppert.com >>>>>>>> twitter: http://twitter.com/jogep >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> 2013/9/11 Lukasz Lenart >>>>>>>> >>>>>>>>> Hi, >>>>>>>>> >>>>>>>>> I'd like to start discussion about the migration process - there = are >>>>>>>>> few things we must clarify, at least: >>>>>>>>> - Git structure >>>>>>>>> - development flow >>>>>>>>> >>>>>>>>> I think we should have just one repo: git.apache.org/struts.git a= nd >>>>>>>>> diverse versions internally via branches - so the current S2 sour= ce >>>>>>>>> become the base and then we will transfer it to 2.5 and 3 in the >>>>>>>>> future. >>>>>>>>> >>>>>>>>> As a flow I like git-flow [1] - well known and used >>>>>>>>> >>>>>>>>> [1] https://github.com/nvie/gitflow >>>>>>>>> >>>>>>>>> >>>>>>>>> Regards >>>>>>>>> -- >>>>>>>>> =C5=81ukasz >>>>>>>>> + 48 606 323 122 http://www.lenart.org.pl/ >>>>>>>>> >>>>>>>>> PS. It'll be implemented after cleaning up current pipeline :-) >>>>>>>>> >>>>>>>>> -----------------------------------------------------------------= ---- >>>>>>>>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >>>>>>>>> For additional commands, e-mail: dev-help@struts.apache.org >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Ren=C3=A9 Gielen >>>>>>> http://twitter.com/rgielen >>>>>>> >>>>>>> -------------------------------------------------------------------= -- >>>>>>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >>>>>>> For additional commands, e-mail: dev-help@struts.apache.org >>>>>>> >>>>>>> >>>>>> >>>>> >>>>> >>>>> --------------------------------------------------------------------- >>>>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >>>>> For additional commands, e-mail: dev-help@struts.apache.org >>>>> >>>>> >>>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >>> For additional commands, e-mail: dev-help@struts.apache.org >>> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >> For additional commands, e-mail: dev-help@struts.apache.org >> > > > -- > Ren=C3=A9 Gielen > http://twitter.com/rgielen > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org > For additional commands, e-mail: dev-help@struts.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org For additional commands, e-mail: dev-help@struts.apache.org