[
https://issues.apache.org/jira/browse/JENA-1396?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16184020#comment-16184020
]
Andy Seaborne commented on JENA-1396:
-------------------------------------
Process (taken from
https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)
{noformat}
git clone https://git-wip-us.apache.org/repos/asf/jena.git JenaTDB2
cd JenaTDB2
# Fix up .git/config to have the right [user]
git config user.email "...."
git config user.name "...."
git checkout -b jena-tdb2
git push -u
git remote add -f mantis https://github.com/afs/mantis.git
git merge -s ours --no-commit mantis/master --allow-unrelated-histories
git read-tree --prefix=jena-db -u mantis/master
git commit -m "JENA-1396: Merge //github/afs/mantis as subdirectory jena-db/"
git status
| On branch jena-tdb2
| Your branch is ahead of 'origin/jena-tdb2' by 634 commits.
| (use "git push" to publish your local commits)
| nothing to commit, working tree clean
git push
{noformat}
> Import codebase github/afs/mantis into Apache Jena
> --------------------------------------------------
>
> Key: JENA-1396
> URL: https://issues.apache.org/jira/browse/JENA-1396
> Project: Apache Jena
> Issue Type: Task
> Reporter: Andy Seaborne
> Assignee: Andy Seaborne
>
> Import the code at https://github.com/afs/mantis.
> Last commit
> [71a70fd76ebc35cda26258bad0459e97f9860b04|https://github.com/afs/mantis/commit/71a70fd76ebc35cda26258bad0459e97f9860b04]
> This code is covered by Software Grants on file.
> The imported code should go into new directory {{jena-db/}}.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
