Changes between Version 54 and Version 55 of WorkingWithGit
- Timestamp:
- Oct 11, 2016, 9:30:03 PM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingWithGit
v54 v55 150 150 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]. 151 151 152 ||= Subversion (Mac OS Forge) =||= Git (GitHub) =||153 ||trunk/base ||macports/ base.git||154 ||trunk/dports ||macports/ ports.git||155 ||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted'' ||156 ||trunk/doc-new ||macports/ guide.git||157 ||trunk/doc ||macports/ guide.git, branch "doc-old"||158 ||trunk/www ||macports/ www.git||159 ||trunk/base/portmgr/jobs ||macports/ infrastructure.git, subfolder "jobs"||160 ||contrib ||macports/ contrib.git||161 ||contrib/{MacPorts_Framework,Pallet} ||macports/ pallet.git||162 ||contrib/mpab ||macports/m p-buildbot.git, branch "mpab"||163 ||contrib/mp-buildbot ||macports/m p-buildbot.git||164 ||contrib/buildbot ||macports/ infrastructure.git, subfolder "buildbot-old"||165 ||contrib/buildbot-test ||macports/ infrastructure.git, subfolder "buildbot"||166 ||users/{dluke,jberry,pipping} ||''deleted (exceeds GitHub size limit, only contains old files)'' ||167 ||users/* ||''separate repository in'' macports/users /*||168 ||distfiles ||''deleted'' ||169 ||downloads ||''deleted'' ||170 ||branches ||''branches of the appropriate repository/-ies'' ||171 ||tags ||''annotated tags in the appropriate repository/-ies'' ||152 ||= Subversion (Mac OS Forge) =||= Git (GitHub) =|| 153 ||trunk/base ||macports/macports-base.git || 154 ||trunk/dports ||macports/macports-ports.git || 155 ||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted'' || 156 ||trunk/doc-new ||macports/macports-guide.git || 157 ||trunk/doc ||macports/macports-guide.git, branch "doc-old" || 158 ||trunk/www ||macports/macports-www.git || 159 ||trunk/base/portmgr/jobs ||macports/macports-infrastructure.git, subfolder "jobs" || 160 ||contrib ||macports/macports-contrib.git || 161 ||contrib/{MacPorts_Framework,Pallet} ||macports/macports-pallet.git || 162 ||contrib/mpab ||macports/macports-buildbot.git, branch "mpab" || 163 ||contrib/mp-buildbot ||macports/macports-buildbot.git || 164 ||contrib/buildbot ||macports/macports-infrastructure.git, branch "buildbot-mpab", subfolder "buildbot" || 165 ||contrib/buildbot-test ||macports/macports-infrastructure.git, subfolder "buildbot" || 166 ||users/{dluke,jberry,pipping} ||''deleted (exceeds GitHub size limit, only contains old files)'' || 167 ||users/* ||''separate repository in'' macports/users-*.git || 168 ||distfiles ||''deleted'' || 169 ||downloads ||''deleted'' || 170 ||branches ||''branches of the appropriate repository/-ies'' || 171 ||tags ||''annotated tags in the appropriate repository/-ies'' || 172 172 173 173 … … 181 181 To get a working copy of the MacPorts ports tree to start changing ports, clone a copy of the repository: 182 182 {{{ 183 git clone git@github.com:macports/ ports.git # or184 git clone https://github.com/macports/ ports.git # if SSH does not work on your network183 git clone git@github.com:macports/macports-ports.git # or 184 git clone https://github.com/macports/macports-ports.git # if SSH does not work on your network 185 185 }}} 186 186 187 187 This will give you the entire history of the ports tree, with the latest version being checked out in the filesystem. 188 188 189 '''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`.189 '''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`. 190 190 191 191 See the [#commit section on committing changes] to find out how to get your changes into the repository. … … 201 201 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. 202 202 {{{ 203 git remote add upstream git@github.com:macports/ ports.git # or204 git remote add upstream https://github.com/macports/ ports.git # if SSH does not work on your network203 git remote add upstream git@github.com:macports/macports-ports.git # or 204 git remote add upstream https://github.com/macports/macports-ports.git # if SSH does not work on your network 205 205 }}} 206 206 … … 226 226 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 227 227 {{{ 228 git clone git@github.com:macports/ base.git # or229 git clone https://github.com/macports/ base.git # if SSH does not work on your network228 git clone git@github.com:macports/macports-base.git # or 229 git clone https://github.com/macports/macports-base.git # if SSH does not work on your network 230 230 }}} 231 231