[MacPorts] WorkingWithGit modified
MacPorts
noreply at macports.org
Tue Oct 11 23:30:06 CEST 2016
Page "WorkingWithGit" was changed by cal at macports.org
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=55>
Revision 55
Comment: Fix repository URLs; we decided to keep the macports- prefix to clearly mark forks as part of MacPorts
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: WorkingWithGit
=========================================================================
--- WorkingWithGit (version: 54)
+++ WorkingWithGit (version: 55)
@@ -149,26 +149,26 @@
Here is a summary of the restructuring; the full set of [https://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git svn2git] conversion rules is available on [https://github.com/neverpanic/macports-svn2git-rules/blob/master/gitconversion.rules Clemens Lang's GitHub].
-||= Subversion (Mac OS Forge) =||= Git (GitHub) =||
-||trunk/base ||macports/base.git ||
-||trunk/dports ||macports/ports.git ||
-||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted'' ||
-||trunk/doc-new ||macports/guide.git ||
-||trunk/doc ||macports/guide.git, branch "doc-old" ||
-||trunk/www ||macports/www.git ||
-||trunk/base/portmgr/jobs ||macports/infrastructure.git, subfolder "jobs" ||
-||contrib ||macports/contrib.git ||
-||contrib/{MacPorts_Framework,Pallet} ||macports/pallet.git ||
-||contrib/mpab ||macports/mp-buildbot.git, branch "mpab" ||
-||contrib/mp-buildbot ||macports/mp-buildbot.git ||
-||contrib/buildbot ||macports/infrastructure.git, subfolder "buildbot-old" ||
-||contrib/buildbot-test ||macports/infrastructure.git, subfolder "buildbot" ||
-||users/{dluke,jberry,pipping} ||''deleted (exceeds GitHub size limit, only contains old files)'' ||
-||users/* ||''separate repository in'' macports/users/* ||
-||distfiles ||''deleted'' ||
-||downloads ||''deleted'' ||
-||branches ||''branches of the appropriate repository/-ies'' ||
-||tags ||''annotated tags in the appropriate repository/-ies'' ||
+||= Subversion (Mac OS Forge) =||= Git (GitHub) =||
+||trunk/base ||macports/macports-base.git ||
+||trunk/dports ||macports/macports-ports.git ||
+||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted'' ||
+||trunk/doc-new ||macports/macports-guide.git ||
+||trunk/doc ||macports/macports-guide.git, branch "doc-old" ||
+||trunk/www ||macports/macports-www.git ||
+||trunk/base/portmgr/jobs ||macports/macports-infrastructure.git, subfolder "jobs" ||
+||contrib ||macports/macports-contrib.git ||
+||contrib/{MacPorts_Framework,Pallet} ||macports/macports-pallet.git ||
+||contrib/mpab ||macports/macports-buildbot.git, branch "mpab" ||
+||contrib/mp-buildbot ||macports/macports-buildbot.git ||
+||contrib/buildbot ||macports/macports-infrastructure.git, branch "buildbot-mpab", subfolder "buildbot" ||
+||contrib/buildbot-test ||macports/macports-infrastructure.git, subfolder "buildbot" ||
+||users/{dluke,jberry,pipping} ||''deleted (exceeds GitHub size limit, only contains old files)'' ||
+||users/* ||''separate repository in'' macports/users-*.git ||
+||distfiles ||''deleted'' ||
+||downloads ||''deleted'' ||
+||branches ||''branches of the appropriate repository/-ies'' ||
+||tags ||''annotated tags in the appropriate repository/-ies'' ||
@@ -180,13 +180,13 @@
=== Checking out a working copy of the ports tree === #cloneports
To get a working copy of the MacPorts ports tree to start changing ports, clone a copy of the repository:
{{{
-git clone git at github.com:macports/ports.git # or
-git clone https://github.com/macports/ports.git # if SSH does not work on your network
+git clone git at github.com:macports/macports-ports.git # or
+git clone https://github.com/macports/macports-ports.git # if SSH does not work on your network
}}}
This will give you the entire history of the ports tree, with the latest version being checked out in the filesystem.
-'''Note:''' If you intend to submit a pull request on GitHub to get your changes included in MacPorts, you may want to create a fork of the repository first. To do that, go to https://github.com/macports/ports/ and click the fork button at the top right. Then, run the command above, but use `<yourusername>/ports.git` instead of `macports/ports.git`.
+'''Note:''' If you intend to submit a pull request on GitHub to get your changes included in MacPorts, you may want to create a fork of the repository first. To do that, go to https://github.com/macports/macports-ports/ and click the fork button at the top right. Then, run the command above, but use `<yourusername>/macports-ports.git` instead of `macports/macports-ports.git`.
See the [#commit section on committing changes] to find out how to get your changes into the repository.
@@ -200,8 +200,8 @@
=== Updating your fork === #upstream-fetch
When submitting pull requests, we may ask you to rebase your changes on top of our current master branch. The easiest way to do this is adding the official repository as a second remote to your working copy and pulling from it. First, use `git remote` to add a reference to the upstream ports tree. Note that the name "upstream" can be chosen at random.
{{{
-git remote add upstream git at github.com:macports/ports.git # or
-git remote add upstream https://github.com/macports/ports.git # if SSH does not work on your network
+git remote add upstream git at github.com:macports/macports-ports.git # or
+git remote add upstream https://github.com/macports/macports-ports.git # if SSH does not work on your network
}}}
Then, fetch the contents of the upstream repository:
@@ -225,8 +225,8 @@
=== Checking out a working copy of MacPorts base === #clone
The source code of MacPorts itself is no longer managed in the same repository as all ports. Contrary to Subversion, checking out a sub-directory of a repository is not possible with Git. In order to avoid that all port maintainers have to clone the complete history of MacPorts base as well, the Subversion repository has been split into multiple separate repositories. MacPorts base is now available using
{{{
-git clone git at github.com:macports/base.git # or
-git clone https://github.com/macports/base.git # if SSH does not work on your network
+git clone git at github.com:macports/macports-base.git # or
+git clone https://github.com/macports/macports-base.git # if SSH does not work on your network
}}}
See the [#reposplit section on repository splitting during the export] to get an overview of where a path in the old Subversion history is now available in Git.
-------8<------8<------8<------8<------8<------8<------8<------8<--------
--
Page URL: <https://trac.macports.org/wiki/WorkingWithGit>
MacPorts <https://www.macports.org/>
Ports system for the Mac operating system
This is an automated message. Someone added your email address to be
notified of changes on 'WorkingWithGit' page.
If it was not you, please report to .
More information about the macports-changes
mailing list