brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject svn commit: r1603888 - in /incubator/brooklyn/site/community: fork-after.png fork-before.png fork-new.png index.html migrate-to-apache.html pull-request.png
Date Thu, 19 Jun 2014 14:24:12 GMT
Author: richard
Date: Thu Jun 19 14:24:12 2014
New Revision: 1603888

URL: http://svn.apache.org/r1603888
Log:
Add guide to re-pointing Git repos to new location

Added:
    incubator/brooklyn/site/community/fork-after.png
    incubator/brooklyn/site/community/fork-before.png
    incubator/brooklyn/site/community/fork-new.png
    incubator/brooklyn/site/community/migrate-to-apache.html
    incubator/brooklyn/site/community/pull-request.png
Modified:
    incubator/brooklyn/site/community/index.html

Added: incubator/brooklyn/site/community/fork-after.png
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/fork-after.png?rev=1603888&view=auto
==============================================================================
Files incubator/brooklyn/site/community/fork-after.png (added) and incubator/brooklyn/site/community/fork-after.png
Thu Jun 19 14:24:12 2014 differ

Added: incubator/brooklyn/site/community/fork-before.png
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/fork-before.png?rev=1603888&view=auto
==============================================================================
Files incubator/brooklyn/site/community/fork-before.png (added) and incubator/brooklyn/site/community/fork-before.png
Thu Jun 19 14:24:12 2014 differ

Added: incubator/brooklyn/site/community/fork-new.png
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/fork-new.png?rev=1603888&view=auto
==============================================================================
Files incubator/brooklyn/site/community/fork-new.png (added) and incubator/brooklyn/site/community/fork-new.png
Thu Jun 19 14:24:12 2014 differ

Modified: incubator/brooklyn/site/community/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/index.html?rev=1603888&r1=1603887&r2=1603888&view=diff
==============================================================================
--- incubator/brooklyn/site/community/index.html (original)
+++ incubator/brooklyn/site/community/index.html Thu Jun 19 14:24:12 2014
@@ -91,6 +91,10 @@ lists to receive new messages.</p>
     <p>If you have changes or additions to the Brooklyn source code, we would love
to
 see them! Please read our guide on <a href="how-to-contribute.html">how to contribute</a>.</p>
 
+    <p>If you have used the <em>brooklyncentral</em> repository prior to
Brooklyn’s move to
+Apache, you can read the guide on
+<a href="migrate-to-apache.html">how to migrate your brooklyncentral fork to Apache</a>.</p>
+
     <p>Committers can read the corresponding <a href="committers.html">guide
for committers</a>
 to see how to review and merge contributions.</p>
 

Added: incubator/brooklyn/site/community/migrate-to-apache.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/migrate-to-apache.html?rev=1603888&view=auto
==============================================================================
--- incubator/brooklyn/site/community/migrate-to-apache.html (added)
+++ incubator/brooklyn/site/community/migrate-to-apache.html Thu Jun 19 14:24:12 2014
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+<title>How to migrate your brooklyncentral fork to Apache - Apache Brooklyn (incubating)</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
+<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+</head>
+
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
+    <div class="container">
+        <div class="container-fluid">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org/">Apache
<img src="https://brooklyn.incubator.apache.org/style/img/brooklyn-logo-150px.png" alt="brooklyn"></a>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav navbar-right">
+                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn
more</a></li>
+                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li>
+                    <li class=""><a href="https://brooklyn.incubator.apache.org/quickstart/">get
started</a></li>
+                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li>
+                    <li class="active"><a href="https://brooklyn.incubator.apache.org/community/">community</a></li>
+                </ul>
+            </div><!-- /.navbar-collapse -->
+        </div><!-- /.container-fluid -->
+    </div>
+</nav>
+
+<div class="container">
+    <h1>How to migrate your brooklyncentral fork to Apache</h1>
+    <p>Prior to our adoption by the Apache Incubator, Brooklyn was developed in a
+GitHub repository at <code>https://github.com/brooklyncentral/brooklyn</code>.
If you
+already have a fork of this repository, follow this guide to smoothly shift
+your repository references to the new repository at Apache.</p>
+
+<p>If you have not forked or cloned the <code>brooklyncentral/brooklyn</code>
repository,
+then this is not the right guide for you. Instead, you should refer to the
+<a href="how-to-contribute.html">How to contribute</a> page, and possibly refer
to
+<a href="https://help.github.com/articles/fork-a-repo">GitHub Help - Fork A Repo</a>
for
+further help.</p>
+
+<h2 id="assumptions">Assumptions</h2>
+
+<p>This guides assumes that you have followed the standard GitHub workflow, as
+describe in <a href="https://help.github.com/articles/fork-a-repo">GitHub Help - Fork
A Repo</a>.
+In particular:</p>
+
+<ul>
+  <li>You have forked the <code>brooklyncentral/brooklyn</code> repository
into your own
+username:</li>
+</ul>
+
+<p><img src="fork-before.png" alt="Screenshot of GitHub showing a typical fork"
/></p>
+
+<ul>
+  <li>You have used <code>git clone</code> to clone this fork onto your
own computer;</li>
+  <li>You have added an additional remote, <code>upstream</code>, to refer
to the original
+<code>brooklyncentral/brooklyn</code> repository.</li>
+</ul>
+
+<p>In short, if you can recognise the above screenshot, and the output of the
+<code>git remote -v</code> command looks similar to below, then this guide should
work
+for you. (Replace <code>rdowner</code> with your own GitHub username.)</p>
+
+<pre><code>origin  https://github.com/rdowner/brooklyn.git (fetch)
+origin  https://github.com/rdowner/brooklyn.git (push)
+upstream        https://github.com/brooklyncentral/brooklyn (fetch)
+upstream        https://github.com/brooklyncentral/brooklyn (push)
+</code></pre>
+
+<p>Or, if you are using SSH to access your remote repositories, it may look like
+this:</p>
+
+<pre><code>origin  git@github.com:rdowner/brooklyn.git (fetch)
+origin  git@github.com:rdowner/brooklyn.git (push)
+upstream        git@github.com:brooklyncentral/brooklyn.git (fetch)
+upstream        git@github.com:brooklyncentral/brooklyn (push)
+</code></pre>
+
+<h2 id="procedure">Procedure</h2>
+
+<p>The new repository has a mirror in GitHub, located at
+<a href="https://github.com/apache/incubator-brooklyn">https://github.com/apache/incubator-brooklyn</a>.
+Go to this page now, and fork it:</p>
+
+<p><img src="fork-new.png" alt="Screenshot of the new repository mirror in GitHub,
with fork button" /></p>
+
+<p>This will now create a fork of this repository under your own username:</p>
+
+<p><img src="fork-after.png" alt="Screenshot of the new fork in your workspace"
/></p>
+
+<p>So previously you referred to repositories named <code>brooklyn</code>
under the
+<code>brooklyncentral</code> organization and your own username. Now, you will
need to
+refer to repositories named <code>incubator-brooklyn</code> under the <code>Apache</code>
+organization and your own username.</p>
+
+<p>To update the cloned repository on your computer to point to the new
+repositories instead of the old ones, use these commands, replacing <code>rdowner</code>
+with your own GitHub username.</p>
+
+<pre><code>git remote set-url origin https://github.com/rdowner/incubator-brooklyn.git
+git remote set-url upstream https://github.com/apache/incubator-brooklyn.git
+</code></pre>
+
+<p>Or, if you would prefer to use SSH to access your remote repositories:</p>
+
+<pre><code>git remote set-url origin git@github.com:rdowner/incubator-brooklyn.git
+git remote set-url upstream git@github.com:apache/incubator-brooklyn.git
+</code></pre>
+
+<p>Finally, fetch everything:</p>
+
+<pre><code>git fetch --all
+</code></pre>
+
+<h2 id="existing-pull-requests">Existing pull requests</h2>
+
+<p>If you have submitted a pull request at <code>brooklyncentral/brooklyn</code>,
this pull
+request will be closed, unmerged, with a message pointing you to this page. You
+will need to re-submit your pull request against the
+<code>apache/incubator-brooklyn</code>.</p>
+
+<p>If you have followed the above procedure, all you will need to do is identify
+the branch in your local repository on your computer that you used to make the
+original pull request, and push this to your new fork:</p>
+
+<p><code>
+git push origin my-new-feature-branch
+</code></p>
+
+<p>Now, go to your <code>incubator-brooklyn</code> fork on the GitHub website,
and you should
+see the <strong>Compare &amp; pull request</strong> button; click this, and
it will set up a
+pull request against the new repository.</p>
+
+<p><img src="pull-request.png" alt="Screen shot of a pull request against incubator-brooklyn"
/></p>
+
+<h2 id="any-problems">Any problems?</h2>
+
+<p>If you are not sure how to do this, perhaps because you have a slightly
+different arrangement in your repositories, or is something unusual happens,
+please ask our community for help. You can find details of our IRC channel
+and mailing lists on our <a href="index.html">Community</a> page.</p>
+
+</div>
+
+<div id="footer">
+    <div class="container">
+        <p class="text-muted">Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License v2.0</a>. Apache Brooklyn is currently undergoing Incubation at the Apache Software
Foundation.</p>
+    </div>
+</div>
+
+
+<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+<script language="JavaScript" type="application/javascript">
+    $(window).resize(function () { 
+        $('body').css('padding-top', parseInt($('#header').css("height"))+10);
+        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+    });
+    
+    $(window).load(function () { 
+        $('body').css('padding-top', parseInt($('#header').css("height"))+10);        
+        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+    });</script>
+</body>
+</html>
+

Added: incubator/brooklyn/site/community/pull-request.png
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/pull-request.png?rev=1603888&view=auto
==============================================================================
Files incubator/brooklyn/site/community/pull-request.png (added) and incubator/brooklyn/site/community/pull-request.png
Thu Jun 19 14:24:12 2014 differ



Mime
View raw message