This looks good. I've had a play with it.

Although I think the next thing is we have to work out how branches and
pull requests will work.

I'm assuming we will start using feature branches, were we will have a
different branch for each JIRA ticket.

Then we need to merge these branches into some sort of a "develop" branch.

Then when ready for release, we merge the develop branch into "master",
which will remain the last released version.
i.e. http://nvie.com/posts/a-successful-git-branching-model/

We should probably document this on the wiki somewhere.

Cheers,
David V



On Fri, Sep 16, 2016 at 4:39 PM, Harry Metske <harry.met...@gmail.com>
wrote:

> Hi,
>
> our svn to git migration is done.
> New resources:
> browse git repo :
> https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary
> git clone url : https://git-wip-us.apache.org/repos/asf/jspwiki.git
> github mirror: https://github.com/apache/jspwiki
>
> I made some quick changes on our wiki to reflect this. We also need quite a
> few changes on our static site, will try to do that later.
>
> regards,
> Harry
>
>
> On 22 August 2016 at 07:55, Harry Metske <harry.met...@gmail.com> wrote:
>
> > OK, asfinfra already has a model JIRA for this (SVN->GIT Migration),
> these
> > fields must be entered, agree with these values ?  :
> >
> > Git Notification Mailing List  :  comm...@jspwiki.apache.org
> > Git Repository Name           : jspwiki
> > Git Repository Import Path  : https://svn.apache.org/repos/asf/jspwiki
> >
> > And we should also have our Jenkins job changed...
> >
> > regards,
> > Harry
> >
> >
> >
> >
> > On 21 August 2016 at 11:50, Dirk Frederickx <dirk.frederi...@gmail.com>
> > wrote:
> >
> >> +1 for me too.
> >>
> >> dirk
> >>
> >> On Sat, Aug 20, 2016 at 9:00 PM, Juan Pablo Santos Rodríguez <
> >> juanpablo.san...@gmail.com> wrote:
> >>
> >> > Hi,
> >> >
> >> > +1 here too
> >> >
> >> > br,
> >> > juan pablo
> >> >
> >> > El 20 ago. 2016 5:14 a. m., "David Vittor" <dvit...@gmail.com>
> >> escribió:
> >> >
> >> > > Oops on mobile. That was meant to be +1. :)
> >> > > On 20/08/2016 1:13 PM, "David Vittor" <dvit...@gmail.com> wrote:
> >> > >
> >> > > > ±1 for git from me also. I use this at work now also, so am
> familiar
> >> > with
> >> > > > it.
> >> > > >
> >> > > > Cheers,
> >> > > > David V
> >> > > > On 20/08/2016 11:23 AM, "Dave Koelmeyer"
> >> <dave.koelmeyer@davekoelmeyer.
> >> > > > co.nz> wrote:
> >> > > >
> >> > > >> On a related note, if this goes ahead perhaps someone (at some
> >> stage)
> >> > > >> can summarise some of the pros of switching to git and I can
> >> create an
> >> > > >> announcement blog post.
> >> > > >>
> >> > > >> Cheers,
> >> > > >> Dave
> >> > > >>
> >> > > >> On 20/08/16 06:01, Jürgen Weber wrote:
> >> > > >> > Hi,
> >> > > >> >
> >> > > >> > I am for git, too.
> >> > > >> > But is there an apache.org repository?
> >> > > >> >
> >> > > >> > Cheers,
> >> > > >> > Juergen
> >> > > >> >
> >> > > >> > 2016-08-19 18:36 GMT+02:00 Harry Metske <
> harry.met...@gmail.com
> >> >:
> >> > > >> >> Hi all,
> >> > > >> >>
> >> > > >> >> how would anyone feel if we migrated our jspwiki codebase from
> >> svn
> >> > to
> >> > > >> git
> >> > > >> >> (github or somewhere else in the apache domain) ?
> >> > > >> >>
> >> > > >> >> I have a strong preference for git (I hardly use svn these
> >> days), I
> >> > > >> guess
> >> > > >> >> most of you feel the same.
> >> > > >> >>
> >> > > >> >> If there are no showstoppers, we could ask infra for the
> >> options.
> >> > > >> >>
> >> > > >> >> regards,
> >> > > >> >> Harry
> >> > > >>
> >> > > >> --
> >> > > >> Dave Koelmeyer
> >> > > >> http://blog.davekoelmeyer.co.nz
> >> > > >> GPG Key ID: 0x238BFF87
> >> > > >>
> >> > > >>
> >> > >
> >> >
> >>
> >
> >
>

Reply via email to