Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tika Wiki" for change notification.
The "UsingGit" page has been changed by ThammeGowda: https://wiki.apache.org/tika/UsingGit?action=diff&rev1=3&rev2=4 Comment: Update: newer migration guides, remote urls and gitbox setup instructions - Apache Tika uses the [[http://git-scm.com/|Git]] version control system. Apache provides writeable Git repositories hosted at [[https://git-wip-us.apache.org|https://git-wip-us.apache.org/]]. This guide assumes you have read the guides and information provided on the Apache Git-WP page. + Apache Tika uses the [[http://git-scm.com/|Git]] version control system. Apache provides writeable Git repositories hosted at [[https://github.com/apache/tika|Github]] and mirrored to [[https://gitbox.apache.org|https://gitbox.apache.org]]. + + = Overview = + This page contains few migrations guides. + 1. If your source code was checkout from SVN repo, scroll down for a guide to migrate to git repo. + 2. If your source code was cloned from a git repo at git-wip-us.apache.org for primary development. Please scroll down to find a guide to migrate to github repo. + 3. Currently, the repository at [[https://github.com/apache/tika]] can be used as a primary repo. If you are looking for a fresh getting started instructions, skip migration guides, start with Developer Workflow and/or Contribution workflow using Github's pull requests. = Migrating from an existing SVN checkout of Tika to Git = @@ -9, +15 @@ 1. `svn status` (ensure no local changes) 2. `mv .svn .svn.old` (or simply `find . -name "*.svn" -exec rm -rf {} \;`) 3. `git init` - 4. `git remote add origin https://git-wip-us.apache.org/repos/asf/tika.git` + 4. `git remote add origin [email protected]:apache/tika.git` 5. `git checkout -b merge-branch` 6. `git fetch --all` 7. `git reset --hard origin/master` 8. `git checkout master` And on my Tika 2.x checkout the last two steps were changed to: - + 1. `git reset --hard origin/2.x` 2. `git checkout 2.x` + + = Migrating to Github from from git-wip-us.apache.org = + Previously the repo was hosted on git-wip-us.apache.org, if you are one of those who cloned it from git-wip-us.a.o and wants to migrate to Github as a primary repo, follow these instructions: + + 1. please update your repository's remote url: + {{{ + git remote set-url origin [email protected]/apache/tika.git + }}} + + 2. If not already enabled - Goto your github account settings and please do 2-Factor-Auth for your account. It's a MUST do, no kidding. + + 3. Connect your apache account to github account. Click on https://gitbox.apache.org/setup/ If you type the URL manually, please note there is a '/' at the end of setup/ + + 4. Authorize your Apache account, and then Authorize your github account. + 1. If you see all three boxes green and a tick inside them, your setup is complete :-) + 2. Infra team had instructed in another mailing list that sometimes 'MFA status' might not tick in first pass. They said that the MFA status updater runs hourly so wait for an hour atleast. This usually happens when you authorize github account without 2FA, it won't go through in first pass. + 3. If you face issues report to infra team! + = Checking out a copy of Tika and modifying it = To check out a copy of Tika, perform the following command: {{{ - git clone https://git-wip-us.apache.org/repos/asf/tika.git trunk + git clone [email protected]:apache/tika.git }}} - This will check out the trunk (master) copy of the code. The normal convention, `master`, used in Git, is replaced with `trunk` in the ASF's repos. + This will check out a copy of the code. Once you have the code, you can modify a file, or two, then add the files for staging/commit, and then commit them. Once done, you can also decide to push the files up to the master repository if you have write access and are a member of the PMC and/or a committer. If you don't have write access to the repository, you can follow [[http://github.com/apache/tika/#contributing|this guide]] for issuing pull requests that committers/PMC members can merge. @@ -36, +60 @@ 1. `git add file1 file2` 2. `git commit -m "message describing change."` - 3. `git push -u origin trunk` + 3. `git push -u origin <branch_name>` + + = Suggested Developer Workflow = @@ -46, +72 @@ 2. modify files, change them, test, etc. 3. `git add <changed files>` (to see them, try `git status` or simply to stage '''all''' changes, `git add *`) 4. `git commit -m "Fixes for TIKA-xxx contributed by <your first name> <your last name> <your email>" - 5. `git checkout trunk` + 5. `git checkout master` 6. `git diff trunk..TIKA-xxx > TIKA-xxx.<your last name>.<yyMMdd>.patch.txt` 7. Attach the patch created in 6 to JIRA. If you are '''not''' looking for a review or you have already had a review and are ready to commit the changes, push them: 0. (if you haven't already merge, the branch into master) `git checkout trunk && git merge TIKA-xxx` - 1. `git push -u origin trunk` + 1. `git push -u origin master` = Suggested User Contribution Workflow =
