You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tika.apache.org by Nick Burch <ni...@apache.org> on 2016/01/22 06:43:00 UTC
Are we on git?
Hi All
I've seen a commit message to git, but no "stop using SVN", and
http://tika.apache.org/contribute.html still talks about SVN being our
master.
What's the status? Have we switched? Still in progress? Where should we
commit to? Is it time to delete our SVN checkouts and re-checkout from
git?
Cheers
Nick
Re: Are we on git?
Posted by "Mattmann, Chris A (3980)" <ch...@jpl.nasa.gov>.
Awesome thanks Nick!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Chief Architect
Instrument Software and Science Data Systems Section (398)
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 168-519, Mailstop: 168-527
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Associate Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-----Original Message-----
From: Nick Burch <ap...@gagravarr.org>
Reply-To: "dev@tika.apache.org" <de...@tika.apache.org>
Date: Friday, January 22, 2016 at 1:37 AM
To: "dev@tika.apache.org" <de...@tika.apache.org>
Subject: Re: Are we on git?
>On Fri, 22 Jan 2016, Mattmann, Chris A (3980) wrote:
>> Our new ASF git repo is:
>> https://git-wip-us.apache.org/repos/asf/tika.git
>>
>> Here’s an email I sent to the OODT-dev list about how
>> to convert from your existing SVN checkout to Git.
>> http://s.apache.org/UNr
>
>Steps I followed on my trunk checkout:
> * svn status
> * (ensured no local changes)
> * mv .svn .svn.old
> * git init
> * git remote add origin https://git-wip-us.apache.org/repos/asf/tika.git
> * git checkout -b merge-branch
> * git fetch --all
> * git reset --hard origin/master
> * git checkout master
>
>And on my Tika 2.x checkout the last two steps were changed to:
> * git reset --hard origin/2.x
> * git checkout 2.x
>
>All seems to be working well now, thanks for the pointers!
>
>
>> Can we file a ticket to update the contribute page?
>
>I've done that page, and the parser guide links
>
>
>The thing that remains to be done is to sort out the site to import the
>examples from Git rather than SVN. I'll raise a ticket for that
>
>Nick
Re: Are we on git?
Posted by Nick Burch <ap...@gagravarr.org>.
On Fri, 22 Jan 2016, Mattmann, Chris A (3980) wrote:
> Our new ASF git repo is:
> https://git-wip-us.apache.org/repos/asf/tika.git
>
> Here’s an email I sent to the OODT-dev list about how
> to convert from your existing SVN checkout to Git.
> http://s.apache.org/UNr
Steps I followed on my trunk checkout:
* svn status
* (ensured no local changes)
* mv .svn .svn.old
* git init
* git remote add origin https://git-wip-us.apache.org/repos/asf/tika.git
* git checkout -b merge-branch
* git fetch --all
* git reset --hard origin/master
* git checkout master
And on my Tika 2.x checkout the last two steps were changed to:
* git reset --hard origin/2.x
* git checkout 2.x
All seems to be working well now, thanks for the pointers!
> Can we file a ticket to update the contribute page?
I've done that page, and the parser guide links
The thing that remains to be done is to sort out the site to import the
examples from Git rather than SVN. I'll raise a ticket for that
Nick
Re: Are we on git?
Posted by "Mattmann, Chris A (3980)" <ch...@jpl.nasa.gov>.
Hi Nick,
We are officially on Git. SVN remains, but it’s R/O.
Our new ASF git repo is:
https://git-wip-us.apache.org/repos/asf/tika.git
Here’s an email I sent to the OODT-dev list about how
to convert from your existing SVN checkout to Git.
http://s.apache.org/UNr
Can we file a ticket to update the contribute page?
Enjoy!
Cheers,
Chris
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Chief Architect
Instrument Software and Science Data Systems Section (398)
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 168-519, Mailstop: 168-527
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Associate Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-----Original Message-----
From: Nick Burch <ni...@apache.org>
Reply-To: "dev@tika.apache.org" <de...@tika.apache.org>
Date: Thursday, January 21, 2016 at 9:43 PM
To: "dev@tika.apache.org" <de...@tika.apache.org>
Subject: Are we on git?
>Hi All
>
>I've seen a commit message to git, but no "stop using SVN", and
>http://tika.apache.org/contribute.html still talks about SVN being our
>master.
>
>What's the status? Have we switched? Still in progress? Where should we
>commit to? Is it time to delete our SVN checkouts and re-checkout from
>git?
>
>Cheers
>Nick
RE: Are we on git?
Posted by Ken Krugler <kk...@transpac.com>.
Sorry, I should have posted to the list - I tried to do an svn commit yesterday and got funky errors.
Checked https://issues.apache.org/jira/browse/INFRA-11092, and saw the comment by Geoffrey that git was R/W, which implied that svn was now read-only.
So I updated my git clone, merged changes from SVN, and committed my change using git.
Which worked fine, BTW :)
-- Ken
> From: Nick Burch
> Sent: January 21, 2016 9:43:00pm PST
> To: dev@tika.apache.org
> Subject: Are we on git?
>
> Hi All
>
> I've seen a commit message to git, but no "stop using SVN", and http://tika.apache.org/contribute.html still talks about SVN being our master.
>
> What's the status? Have we switched? Still in progress? Where should we commit to? Is it time to delete our SVN checkouts and re-checkout from git?
>
> Cheers
> Nick
--------------------------
Ken Krugler
+1 530-210-6378
http://www.scaleunlimited.com
custom big data solutions & training
Hadoop, Cascading, Cassandra & Solr
--------------------------
Ken Krugler
+1 530-210-6378
http://www.scaleunlimited.com
custom big data solutions & training
Hadoop, Cascading, Cassandra & Solr