Modified: brooklyn/site/developers/code/git-more.html URL: http://svn.apache.org/viewvc/brooklyn/site/developers/code/git-more.html?rev=1925014&r1=1925013&r2=1925014&view=diff ============================================================================== --- brooklyn/site/developers/code/git-more.html (original) +++ brooklyn/site/developers/code/git-more.html Fri Apr 11 07:44:54 2025 @@ -25,7 +25,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"; rel="stylesheet" /> +<link href="/style/deps/bootstrap.min.css" rel="stylesheet" /> <link href="/style/deps/octicons/octicons.css" rel="stylesheet" /> <link href="/style/deps/bootstrap-theme.css" rel="stylesheet" /> <link href="/style/deps/font-awesome-4.2.0/css/font-awesome.min.css" rel="stylesheet" /> @@ -33,7 +33,8 @@ <link href="/style/css/code.css" rel="stylesheet" /> <link href="/style/css/website.css" rel="stylesheet" /> -<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js";></script> +<script type="text/javascript" src="/style/deps/jquery.js"></script> + </head> <body class="page"> @@ -55,11 +56,11 @@ <li class="dropdown"> - <a href="/learnmore/index.html" data-toggle="dropdown">learn more <span class="caret"></span></a> + <a href="/learnmore/" data-toggle="dropdown">learn more <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/learnmore/index.html">Learn More</a> + <a href="/learnmore/">Learn More</a> </li> <li class="divider"></li> @@ -72,7 +73,7 @@ <li > - <a href="/learnmore/features/index.html">Features + <a href="/learnmore/features/">Features </a> </li> @@ -86,7 +87,7 @@ <li > - <a href="/learnmore/catalog/index.html">Browse Catalog + <a href="/learnmore/catalog/">Browse Catalog </a> </li> @@ -98,11 +99,11 @@ <li class="dropdown"> - <a href="/v/latest/start/index.html" data-toggle="dropdown">get started <span class="caret"></span></a> + <a href="/v/latest/start/" data-toggle="dropdown">get started <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/v/latest/start/index.html">Get Started</a> + <a href="/v/latest/start/">Get Started</a> </li> <li class="divider"></li> @@ -148,17 +149,17 @@ <li class="dropdown"> - <a href="/documentation/index.html" data-toggle="dropdown">documentation <span class="caret"></span></a> + <a href="/documentation/" data-toggle="dropdown">documentation <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/documentation/index.html">Documentation</a> + <a href="/documentation/">Documentation</a> </li> <li class="divider"></li> <li class="section"> - <a href="/v/latest/index.html">User Guide + <a href="/v/latest/">User Guide </a> </li> <li class="divider"></li> @@ -172,21 +173,21 @@ <li > - <a href="/v/latest/locations/index.html">Deploying Blueprints + <a href="/v/latest/locations/">Deploying Blueprints </a> </li> <li class="section"> - <a href="/v/latest/ops/index.html">Reference Guide + <a href="/v/latest/ops/">Reference Guide </a> </li> <li class="divider"></li> <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> @@ -212,11 +213,11 @@ <li class="dropdown"> - <a href="/community/index.html" data-toggle="dropdown">community <span class="caret"></span></a> + <a href="/community/" data-toggle="dropdown">community <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/community/index.html">Community</a> + <a href="/community/">Community</a> </li> <li class="divider"></li> @@ -236,7 +237,7 @@ <li > - <a href="/community/security/index.html">Security Advisories + <a href="/community/security/">Security Advisories </a> </li> @@ -257,8 +258,8 @@ <li > - <a href="/community/gsoc.html">Google Summer of Code - </a> + <a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy Policy + <span class="octicon octicon-link-external"></span></a> </li> @@ -269,17 +270,17 @@ <li class="dropdown active"> - <a href="/developers/index.html" data-toggle="dropdown">developers <span class="caret"></span></a> + <a href="/developers/" data-toggle="dropdown">developers <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/developers/index.html">Developers</a> + <a href="/developers/">Developers</a> </li> <li class="divider"></li> <li > - <a href="/developers/code/index.html">Get the Code + <a href="/developers/code/">Get the Code </a> </li> @@ -293,14 +294,14 @@ <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> <li > - <a href="/developers/committers/index.html">Committer Guide + <a href="/developers/committers/">Committer Guide </a> </li> @@ -340,7 +341,7 @@ <li class="dropdown"> - <a href="/download/index.html" class="btn btn-default navbar-btn">download</a> + <a href="/download/" class="btn btn-default navbar-btn">download</a> </li> @@ -362,61 +363,61 @@ youâll probably want your own forks and a slightly different git remote setup.</p> <p>You can create forks of each Brooklyn repo <a href="https://github.com/apache?query=brooklyn";>in the GitHub UI</a> -or, if you have the command-line tool <code>hub</code> (<a href="https://github.com/github/hub";>described here</a>, or <code>sudo npm install -g hub</code>), +or, if you have the command-line tool <code class="language-plaintext highlighter-rouge">hub</code> (<a href="https://github.com/github/hub";>described here</a>, or <code class="language-plaintext highlighter-rouge">sudo npm install -g hub</code>), by running this command:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">hub fork<span class="p">;</span> git submodule foreach <span class="s1">'hub fork'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">hub fork<span class="p">;</span> git submodule foreach <span class="s1">'hub fork'</span></code></pre></figure> -<p>The <a href="index.html">Get the Code: Basics</a> page described how to retrieve the upstream repos, -but it gave those remotes the name <code>origin</code>. -When using forks, <code>upstream</code> is a more accurate name. +<p>The <a href="/developers/code/">Get the Code: Basics</a> page described how to retrieve the upstream repos, +but it gave those remotes the name <code class="language-plaintext highlighter-rouge">origin</code>. +When using forks, <code class="language-plaintext highlighter-rouge">upstream</code> is a more accurate name. You can rename the origin remotes with:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">git remote rename origin upstream<span class="p">;</span> git submodule foreach <span class="s1">'git remote rename origin upstream'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">git remote rename origin upstream<span class="p">;</span> git submodule foreach <span class="s1">'git remote rename origin upstream'</span></code></pre></figure> -<p>Youâll now likely want to add the remote <code>origin</code> for your fork:</p> +<p>Youâll now likely want to add the remote <code class="language-plaintext highlighter-rouge">origin</code> for your fork:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="k">if</span> <span class="o">[</span> -z <span class="s2">"$GITHUB_ID"</span> <span class="o">]</span> <span class="p">;</span> <span class="k">then</span> <span class="nb">echo</span> -n <span class="s2">"Enter your GitHub ID id: "</span> <span class="p">;</span> <span class="nb">read </span>GITHUB_ID <span class="p">;</span> <span class="k">fi</span> -git remote add origin [email protected]:<span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span>/brooklyn -git submodule foreach <span class="s1">'git remote add origin [email protected]:${GITHUB_ID}/${name}'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="k">if</span> <span class="o">[</span> <span class="nt">-z</span> <span class="s2">"</span><span class="nv">$GITHUB_ID</span><span class="s2">"</span> <span class="o">]</span> <span class="p">;</span> <span class="k">then </span><span class="nb">echo</span> <span class="nt">-n</span> <span class="s2">"Enter your GitHub ID id: "</span> <span class="p">;</span> <span class="nb">read </span>GITHUB_ID <span class="p">;</span> <span class="k">fi +</span>git remote add origin [email protected]:<span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span>/brooklyn +git submodule foreach <span class="s1">'git remote add origin [email protected]:${GITHUB_ID}/${name}'</span></code></pre></figure> <p>And if you created the fork in the GitHub UI, you may want to create a remote named by your -GitHub ID as well (if you used <code>hub</code> it will have done it for you):</p> +GitHub ID as well (if you used <code class="language-plaintext highlighter-rouge">hub</code> it will have done it for you):</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="k">if</span> <span class="o">[</span> -z <span class="s2">"$GITHUB_ID"</span> <span class="o">]</span> <span class="p">;</span> <span class="k">then</span> <span class="nb">echo</span> -n <span class="s2">"Enter your GitHub ID id: "</span> <span class="p">;</span> <span class="nb">read </span>GITHUB_ID <span class="p">;</span> <span class="k">fi</span> -git remote add <span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span> [email protected]:<span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span>/brooklyn -git submodule foreach <span class="s1">'git remote add ${GITHUB_ID} [email protected]:${GITHUB_ID}/${name}'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="k">if</span> <span class="o">[</span> <span class="nt">-z</span> <span class="s2">"</span><span class="nv">$GITHUB_ID</span><span class="s2">"</span> <span class="o">]</span> <span class="p">;</span> <span class="k">then </span><span class="nb">echo</span> <span class="nt">-n</span> <span class="s2">"Enter your GitHub ID id: "</span> <span class="p">;</span> <span class="nb">read </span>GITHUB_ID <span class="p">;</span> <span class="k">fi +</span>git remote add <span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span> [email protected]:<span class="k">${</span><span class="nv">GITHUB_ID</span><span class="k">}</span>/brooklyn +git submodule foreach <span class="s1">'git remote add ${GITHUB_ID} [email protected]:${GITHUB_ID}/${name}'</span></code></pre></figure> -<p>You probably also want the default <code>push</code> target to be your repo in the <code>origin</code> remote:</p> +<p>You probably also want the default <code class="language-plaintext highlighter-rouge">push</code> target to be your repo in the <code class="language-plaintext highlighter-rouge">origin</code> remote:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">git config remote.pushDefault origin<span class="p">;</span> git submodule foreach <span class="s1">'git config remote.pushDefault origin'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">git config remote.pushDefault origin<span class="p">;</span> git submodule foreach <span class="s1">'git config remote.pushDefault origin'</span></code></pre></figure> <p>Optionally, if youâre interested in reviewing pull requests, -you may wish to have <code>git</code> automatically check out PR branches: </p> +you may wish to have <code class="language-plaintext highlighter-rouge">git</code> automatically check out PR branches:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">git config --local --add remote.upstream.fetch <span class="s1">'+refs/pull/*/head:refs/remotes/upstream/pr/*'</span> -git submodule foreach <span class="s2">"git config --local --add remote.upstream.fetch '+refs/pull/*/head:refs/remotes/upstream/pr/*'"</span> -git pull <span class="p">;</span> git submodule foreach <span class="s1">'git pull'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">git config <span class="nt">--local</span> <span class="nt">--add</span> remote.upstream.fetch <span class="s1">'+refs/pull/*/head:refs/remotes/upstream/pr/*'</span> +git submodule foreach <span class="s2">"git config --local --add remote.upstream.fetch '+refs/pull/*/head:refs/remotes/upstream/pr/*'"</span> +git pull <span class="p">;</span> git submodule foreach <span class="s1">'git pull'</span></code></pre></figure> <p>And also optionally, to set up the official Apache repo as a remote â useful if GitHub is slow to update (and required if youâre a committer):</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">git remote add apache-git https://gitbox.apache.org/repos/asf/brooklyn -git submodule foreach <span class="s1">'git remote add apache-git https://gitbox.apache.org/repos/asf/${name}'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">git remote add apache-git https://git-wip-us.apache.org/repos/asf/brooklyn +git submodule foreach <span class="s1">'git remote add apache-git https://git-wip-us.apache.org/repos/asf/${name}'</span></code></pre></figure> -<p><strong>Thatâs it.</strong> Test that itâs all working by browsing the submodules and issuing <code>git remote -v</code> and <code>git pull</code> commands. Also see the aliases below.</p> +<p><strong>Thatâs it.</strong> Test that itâs all working by browsing the submodules and issuing <code class="language-plaintext highlighter-rouge">git remote -v</code> and <code class="language-plaintext highlighter-rouge">git pull</code> commands. Also see the aliases below.</p> <p>To work on code in a branch, in any of the submodules, you can simply do the following:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">% git branch my-new-feature-branch upstream/master +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">% git branch my-new-feature-branch upstream/master % git checkout my-new-feature-branch <span class="o">(</span>make some commits<span class="o">)</span> % git push To https://github.com/your_account/brooklyn.git - * <span class="o">[</span>new branch<span class="o">]</span> my-new-feature-branch -> my-new-feature-branch</code></pre></div> + <span class="k">*</span> <span class="o">[</span>new branch] my-new-feature-branch -> my-new-feature-branch</code></pre></figure> -<p>Note how the branch is tracking <code>upstream/master</code> for the purpose of <code>git pull</code>, -but a <code>git push</code> goes to the fork. +<p>Note how the branch is tracking <code class="language-plaintext highlighter-rouge">upstream/master</code> for the purpose of <code class="language-plaintext highlighter-rouge">git pull</code>, +but a <code class="language-plaintext highlighter-rouge">git push</code> goes to the fork. When youâre finished, donât forget to go to the UI of your repo to open a pull request.</p> <h2 id="multi-project-changes">Multi-Project Changes</h2> @@ -436,37 +437,37 @@ in the dependent PR to help reviewers <p>There are branches for each released version and tags for various other milestones.</p> -<p>As described in more detail <a href="git-more.html#how-we-use-branches">here</a>, +<p>As described in more detail <a href="/developers/code/git-more.html#how-we-use-branches">here</a>, we primarily use submodule remote branch tracking rather than submodule SHA1 IDâs.</p> -<p>The history prior to <code>0.9.0</code> is imported from the legacy <code>incubator-brooklyn</code> repo for reference and history only. +<p>The history prior to <code class="language-plaintext highlighter-rouge">0.9.0</code> is imported from the legacy <code class="language-plaintext highlighter-rouge">incubator-brooklyn</code> repo for reference and history only. Visit that repo to build those versions; they are not intended to build here. (Although this works: -<code>mkdir merged ; for x in brooklyn-* ; do pushd $x ; git checkout 0.8.0-incubating ; cp -r * ../merged ; popd ; cd merged ; mvn clean install</code>.)</p> +<code class="language-plaintext highlighter-rouge">mkdir merged ; for x in brooklyn-* ; do pushd $x ; git checkout 0.8.0-incubating ; cp -r * ../merged ; popd ; cd merged ; mvn clean install</code>.)</p> <h3 id="tracking-branches">Tracking Branches</h3> <p>Our submodules track <strong>branches</strong>, rather than specific commits, -although due to the way <code>git</code> works there are still references to specific commits.</p> +although due to the way <code class="language-plaintext highlighter-rouge">git</code> works there are still references to specific commits.</p> -<p>We track <code>master</code> for the master branch and the version branch for other official branches, -starting with <code>0.9.0</code>. +<p>We track <code class="language-plaintext highlighter-rouge">master</code> for the master branch and the version branch for other official branches, +starting with <code class="language-plaintext highlighter-rouge">0.9.0</code>. We update the uber-project recorded SHA reference to subprojects on releases but not regularly â -that just creates noise and is unnecessary with the <code>--remote</code> option on <code>submodule update</code>. -In fact, <code>git submodule update --remote --merge</code> pretty much works well; -the <code>git sup</code> alias (below) makes it even easier.</p> +that just creates noise and is unnecessary with the <code class="language-plaintext highlighter-rouge">--remote</code> option on <code class="language-plaintext highlighter-rouge">submodule update</code>. +In fact, <code class="language-plaintext highlighter-rouge">git submodule update --remote --merge</code> pretty much works well; +the <code class="language-plaintext highlighter-rouge">git sup</code> alias (below) makes it even easier.</p> -<p>On the other hand, <code>git status</code> is not very nice in the uber-project: +<p>On the other hand, <code class="language-plaintext highlighter-rouge">git status</code> is not very nice in the uber-project: it will show a ânew commitsâ message for submodules, unless youâre exactly at the uber-projectâs recorded reference. Ignore these. It will tell you if you have uncommitted changes, but itâs not very useful for telling whether youâre up to date or if you have newer changes committed in the subproject or in your push branch. -If you go in to each sub-project, <code>git status</code> works better, but it can be confusing +If you go in to each sub-project, <code class="language-plaintext highlighter-rouge">git status</code> works better, but it can be confusing to track which branch each subproject is one. -A <code>summary</code> script is provided below which solves these issues, +A <code class="language-plaintext highlighter-rouge">summary</code> script is provided below which solves these issues, showing useful status across all subprojects.</p> <h2 id="about-submodules">About Submodules</h2> @@ -481,10 +482,10 @@ You can also work <a href="#not-using-su <ul> <li> <p><strong>Donât copy submodule directories.</strong> This doesnât act as youâd expect; -its <code>.git</code> record simply points at the parent projectâs <code>.git</code> folder, +its <code class="language-plaintext highlighter-rouge">.git</code> record simply points at the parent projectâs <code class="language-plaintext highlighter-rouge">.git</code> folder, which in turn points back at it. So if you copy it and make changes in the copy, itâs rather surprising where those changes actually get made. -Worse, <code>git</code> doesnât report errors; youâll only notice it when you see files change bizarrely.</p> +Worse, <code class="language-plaintext highlighter-rouge">git</code> doesnât report errors; youâll only notice it when you see files change bizarrely.</p> </li> <li> <p><strong>Be careful committing in the uber-project.</strong> @@ -492,7 +493,7 @@ You can update commit IDs, but if these everyone else sees errors. Itâs useful to do this on release (and update the target branch then also) and maybe occasionally at other milestones but so much at other times as these IDâs -very quickly become stale on <code>master</code>.</p> +very quickly become stale on <code class="language-plaintext highlighter-rouge">master</code>.</p> </li> </ul> @@ -501,7 +502,7 @@ very quickly become stale on <code>maste <ul> <li>[1] <a href="https://git-scm.com/book/en/v2/Git-Tools-Submodules";>Git SCM Book</a></li> <li>[2] <a href="https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407#.r7677prhv";>Medium blog: Mastering Git Submodules</a></li> - <li>[3] <code>git submodule --help</code> section on <code>update</code></li> + <li>[3] <code class="language-plaintext highlighter-rouge">git submodule --help</code> section on <code class="language-plaintext highlighter-rouge">update</code></li> <li>[4] <a href="http://stackoverflow.com/questions/1777854/git-submodules-specify-a-branch-tag/18797720#18797720";>StackOverflow: Git Submodules Branch Tag</a></li> </ul> @@ -509,7 +510,7 @@ very quickly become stale on <code>maste <p>If you donât want to use submodules, you can clone everything as top-level projects with the following:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">mkdir apache-brooklyn +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nb">mkdir </span>apache-brooklyn <span class="nb">cd </span>apache-brooklyn git clone http://github.com/apache/brooklyn/ git clone http://github.com/apache/brooklyn-ui/ @@ -517,74 +518,74 @@ git clone http://github.com/apache/brook git clone http://github.com/apache/brooklyn-client/ git clone http://github.com/apache/brooklyn-docs/ git clone http://github.com/apache/brooklyn-library/ -git clone http://github.com/apache/brooklyn-dist/</code></pre></div> +git clone http://github.com/apache/brooklyn-dist/</code></pre></figure> -<p>With one symbolic link in the root <code>apache-brooklyn/</code> dir, you can then use a normal <code>mvn</code> workflow:</p> +<p>With one symbolic link in the root <code class="language-plaintext highlighter-rouge">apache-brooklyn/</code> dir, you can then use a normal <code class="language-plaintext highlighter-rouge">mvn</code> workflow:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">ln -s brooklyn/pom.xml . -mvn clean install</code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nb">ln</span> <span class="nt">-s</span> brooklyn/pom.xml <span class="nb">.</span> +mvn clean <span class="nb">install</span></code></pre></figure> <p>With minor changes you can follow the instructions for creating forks and getting all updates elsewhere on this page.</p> <h2 id="useful-aliases-and-commands">Useful Aliases and Commands</h2> -<p>This sets up variants of <code>pull</code>, <code>diff</code>, and <code>push</code> â called <code>sup</code>, <code>sdiff</code>, and <code>spush</code> â which act across submodules:</p> +<p>This sets up variants of <code class="language-plaintext highlighter-rouge">pull</code>, <code class="language-plaintext highlighter-rouge">diff</code>, and <code class="language-plaintext highlighter-rouge">push</code> â called <code class="language-plaintext highlighter-rouge">sup</code>, <code class="language-plaintext highlighter-rouge">sdiff</code>, and <code class="language-plaintext highlighter-rouge">spush</code> â which act across submodules:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># update all modules</span> -git config --global alias.sup <span class="s1">'!git pull && git submodule update --remote --merge --recursive'</span> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># update all modules</span> +git config <span class="nt">--global</span> alias.sup <span class="s1">'!git pull && git submodule update --remote --merge --recursive'</span> <span class="c"># show diffs across all modules</span> -git config --global alias.sdiff <span class="s1">'!git diff && git submodule foreach "git diff"'</span> +git config <span class="nt">--global</span> alias.sdiff <span class="s1">'!git diff && git submodule foreach "git diff"'</span> <span class="c"># return to master in all modules</span> -git config --global alias.smaster <span class="s1">'!git checkout master && echo && git submodule foreach "git checkout master && echo"'</span> +git config <span class="nt">--global</span> alias.smaster <span class="s1">'!git checkout master && echo && git submodule foreach "git checkout master && echo"'</span> <span class="c"># push in all modules</span> -git config --global alias.spush <span class="s1">'!git push && git submodule foreach "git push"'</span> +git config <span class="nt">--global</span> alias.spush <span class="s1">'!git push && git submodule foreach "git push"'</span> <span class="c"># show issues in all projects (only works if upstream configured properly for current branch)</span> -git config --global alias.si <span class="s1">'!hub issue && git submodule foreach "hub issue"'</span></code></pre></div> +git config <span class="nt">--global</span> alias.si <span class="s1">'!hub issue && git submodule foreach "hub issue"'</span></code></pre></figure> <h4 id="getting-a-summary-of-submodules">Getting a Summary of Submodules</h4> -<p>The <code>git-summary</code> script <a href="https://github.com/apache/brooklyn-dist/tree/master/scripts";>in the brooklyn-dist/scripts</a> makes +<p>The <code class="language-plaintext highlighter-rouge">git-summary</code> script <a href="https://github.com/apache/brooklyn-dist/tree/master/scripts";>in the brooklyn-dist/scripts</a> makes working with submodules much more enjoyable. -Follow the <code>README</code> in that directory to add those scripts to your path, and then set up the following git aliases:</p> +Follow the <code class="language-plaintext highlighter-rouge">README</code> in that directory to add those scripts to your path, and then set up the following git aliases:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">curl https://gist.githubusercontent.com/ahgittin/6399a29df1229a37b092/raw/208cf4b3ec2ede77297d2f6011821ae62cf9ac0c/git-summary.sh <span class="se">\</span> - <span class="p">|</span> sudo tee /usr/local/bin/git-summary -sudo chmod <span class="m">755</span> /usr/local/bin/git-summary -git config --global alias.ss <span class="s1">'!git-summary -r'</span> -git config --global alias.so <span class="s1">'!git-summary -r -o'</span></code></pre></div> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">curl https://gist.githubusercontent.com/ahgittin/6399a29df1229a37b092/raw/208cf4b3ec2ede77297d2f6011821ae62cf9ac0c/git-summary.sh <span class="se">\</span> + | <span class="nb">sudo tee</span> /usr/local/bin/git-summary +<span class="nb">sudo chmod </span>755 /usr/local/bin/git-summary +git config <span class="nt">--global</span> alias.ss <span class="s1">'!git-summary -r'</span> +git config <span class="nt">--global</span> alias.so <span class="s1">'!git-summary -r -o'</span></code></pre></figure> -<p>Then <code>git ss</code> will give output such as:</p> +<p>Then <code class="language-plaintext highlighter-rouge">git ss</code> will give output such as:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">brooklyn: master <- upstream/master <span class="o">(</span>up to date<span class="o">)</span> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">brooklyn: master <- upstream/master <span class="o">(</span>up to <span class="nb">date</span><span class="o">)</span> -brooklyn-client: master <- upstream/master <span class="o">(</span>up to date<span class="o">)</span> +brooklyn-client: master <- upstream/master <span class="o">(</span>up to <span class="nb">date</span><span class="o">)</span> -brooklyn-dist: master <- upstream/master <span class="o">(</span>up to date<span class="o">)</span> +brooklyn-dist: master <- upstream/master <span class="o">(</span>up to <span class="nb">date</span><span class="o">)</span> brooklyn-docs: master <- upstream/master <span class="o">(</span>uncommitted changes only<span class="o">)</span> M guide/dev/code/submodules.md -brooklyn-library: master <- upstream/master <span class="o">(</span>up to date<span class="o">)</span> +brooklyn-library: master <- upstream/master <span class="o">(</span>up to <span class="nb">date</span><span class="o">)</span> -brooklyn-server: master <- upstream/master <span class="o">(</span>up to date<span class="o">)</span> +brooklyn-server: master <- upstream/master <span class="o">(</span>up to <span class="nb">date</span><span class="o">)</span> -brooklyn-ui: <span class="nb">test</span> <- origin/test <span class="o">(</span>upstream <span class="m">2</span> ahead of master<span class="o">)</span> - > 62c553e Alex Heneveld, <span class="m">18</span> minutes ago: WIP 2 - > 22cd0ad Alex Heneveld, <span class="m">62</span> minutes ago: WIP 1 - ?? wip-local-untracked-file</code></pre></div> +brooklyn-ui: <span class="nb">test</span> <- origin/test <span class="o">(</span>upstream 2 ahead of master<span class="o">)</span> + <span class="o">></span> 62c553e Alex Heneveld, 18 minutes ago: WIP 2 + <span class="o">></span> 22cd0ad Alex Heneveld, 62 minutes ago: WIP 1 + ?? wip-local-untracked-file</code></pre></figure> -<p>The command <code>git so</code> does the same thing without updating remotes. +<p>The command <code class="language-plaintext highlighter-rouge">git so</code> does the same thing without updating remotes. Use it if you want it to run fast, or if youâre offline. -For more information un <code>git-summary --help</code>.</p> +For more information un <code class="language-plaintext highlighter-rouge">git-summary --help</code>.</p> <h4 id="other-handy-commands">Other Handy Commands</h4> -<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># run a git command (eg pull) in each submodule</span> -git submodule foreach <span class="s1">'git pull'</span> +<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># run a git command (eg pull) in each submodule</span> +git submodule foreach <span class="s1">'git pull'</span> <span class="c"># iterate across submodules in bash, e.g. doing git status</span> -<span class="k">for</span> x in brooklyn-* <span class="p">;</span> <span class="k">do</span> <span class="nb">pushd</span> <span class="nv">$x</span> <span class="p">;</span> git status <span class="p">;</span> <span class="nb">popd</span> <span class="p">;</span> <span class="k">done</span></code></pre></div> +<span class="k">for </span>x <span class="k">in </span>brooklyn-<span class="k">*</span> <span class="p">;</span> <span class="k">do </span><span class="nb">pushd</span> <span class="nv">$x</span> <span class="p">;</span> git status <span class="p">;</span> <span class="nb">popd</span> <span class="p">;</span> <span class="k">done</span></code></pre></figure> <h2 id="legacy-incubator-pull-requests">Legacy Incubator Pull Requests</h2> @@ -592,14 +593,14 @@ git submodule foreach <span class="s1">& splitting it up into submodules, itâs fairly straightforward:</p> <ol> - <li>In the incubator codebase, start at its final state: <code>cd .../incubator-brooklyn && git checkout master && git pull</code></li> - <li>Make a branch for your merged changes: <code>git checkout -b my-branch-merged-master</code></li> - <li>Merge or rebase the required commits (resolving conflicts; but donât worry about commit messages): <code>git merge my-branch</code></li> - <li>Create a patch file: <code>git diff > /tmp/diff-for-my-branch</code></li> - <li>Go to the new <code>brooklyn</code> uber-project directory. -Ensure you are at master and all subprojects updated: <code>cd .../brooklyn/ && git sup</code></li> - <li>Apply the patch: <code>patch -p1 < /tmp/diff-for-my-branch</code> </li> - <li>Inspect the changes: <code>git ss</code></li> + <li>In the incubator codebase, start at its final state: <code class="language-plaintext highlighter-rouge">cd .../incubator-brooklyn && git checkout master && git pull</code></li> + <li>Make a branch for your merged changes: <code class="language-plaintext highlighter-rouge">git checkout -b my-branch-merged-master</code></li> + <li>Merge or rebase the required commits (resolving conflicts; but donât worry about commit messages): <code class="language-plaintext highlighter-rouge">git merge my-branch</code></li> + <li>Create a patch file: <code class="language-plaintext highlighter-rouge">git diff > /tmp/diff-for-my-branch</code></li> + <li>Go to the new <code class="language-plaintext highlighter-rouge">brooklyn</code> uber-project directory. +Ensure you are at master and all subprojects updated: <code class="language-plaintext highlighter-rouge">cd .../brooklyn/ && git sup</code></li> + <li>Apply the patch: <code class="language-plaintext highlighter-rouge">patch -p1 < /tmp/diff-for-my-branch</code></li> + <li>Inspect the changes: <code class="language-plaintext highlighter-rouge">git ss</code></li> <li>Test it, commit each changed project on a branch and create pull requests. Where applicable, record the original author(s) and message(s) in the commit.</li> </ol> @@ -616,12 +617,12 @@ Where applicable, record the original au <h4 class=" with_following"> - <a href="/developers/index.html" class="list-group-item breadcrumb breadcrumb0"> + <a href="/developers/" class="list-group-item breadcrumb breadcrumb0"> Developers </a></h4> <h4 class=" with_preceding"> - <a href="/developers/code/index.html" class="list-group-item breadcrumb breadcrumb1"> + <a href="/developers/code/" class="list-group-item breadcrumb breadcrumb1"> Get the Code </a></h4> @@ -862,8 +863,8 @@ Where applicable, record the original au </div> <div class="col-md-3 text-right"> <p> - <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/website/developers/code/git-more.md";>Edit This Page</a> - <a href="https://brooklyn.apache.org/community/how-to-contribute-docs.html"; + <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/master/website/developers/code/git-more.md";>Edit This Page</a> + <a href="/community/how-to-contribute-docs.html" data-toggle="tooltip" data-placement="top" title="" data-delay="400" data-original-title="How to Edit Documentation"> <span class="octicon octicon-question octicon-footer"></span> </a> @@ -902,4 +903,5 @@ Where applicable, record the original au ZeroClipboard.config({ moviePath: '/style/js/zeroclipboard/ZeroClipboard.swf' }); </script> <script src="/style/js/public.js"></script> + </html>
Modified: brooklyn/site/developers/code/index.html URL: http://svn.apache.org/viewvc/brooklyn/site/developers/code/index.html?rev=1925014&r1=1925013&r2=1925014&view=diff ============================================================================== --- brooklyn/site/developers/code/index.html (original) +++ brooklyn/site/developers/code/index.html Fri Apr 11 07:44:54 2025 @@ -25,7 +25,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"; rel="stylesheet" /> +<link href="/style/deps/bootstrap.min.css" rel="stylesheet" /> <link href="/style/deps/octicons/octicons.css" rel="stylesheet" /> <link href="/style/deps/bootstrap-theme.css" rel="stylesheet" /> <link href="/style/deps/font-awesome-4.2.0/css/font-awesome.min.css" rel="stylesheet" /> @@ -33,7 +33,8 @@ <link href="/style/css/code.css" rel="stylesheet" /> <link href="/style/css/website.css" rel="stylesheet" /> -<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js";></script> +<script type="text/javascript" src="/style/deps/jquery.js"></script> + </head> <body class="page"> @@ -55,11 +56,11 @@ <li class="dropdown"> - <a href="/learnmore/index.html" data-toggle="dropdown">learn more <span class="caret"></span></a> + <a href="/learnmore/" data-toggle="dropdown">learn more <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/learnmore/index.html">Learn More</a> + <a href="/learnmore/">Learn More</a> </li> <li class="divider"></li> @@ -72,7 +73,7 @@ <li > - <a href="/learnmore/features/index.html">Features + <a href="/learnmore/features/">Features </a> </li> @@ -86,7 +87,7 @@ <li > - <a href="/learnmore/catalog/index.html">Browse Catalog + <a href="/learnmore/catalog/">Browse Catalog </a> </li> @@ -98,11 +99,11 @@ <li class="dropdown"> - <a href="/v/latest/start/index.html" data-toggle="dropdown">get started <span class="caret"></span></a> + <a href="/v/latest/start/" data-toggle="dropdown">get started <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/v/latest/start/index.html">Get Started</a> + <a href="/v/latest/start/">Get Started</a> </li> <li class="divider"></li> @@ -148,17 +149,17 @@ <li class="dropdown"> - <a href="/documentation/index.html" data-toggle="dropdown">documentation <span class="caret"></span></a> + <a href="/documentation/" data-toggle="dropdown">documentation <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/documentation/index.html">Documentation</a> + <a href="/documentation/">Documentation</a> </li> <li class="divider"></li> <li class="section"> - <a href="/v/latest/index.html">User Guide + <a href="/v/latest/">User Guide </a> </li> <li class="divider"></li> @@ -172,21 +173,21 @@ <li > - <a href="/v/latest/locations/index.html">Deploying Blueprints + <a href="/v/latest/locations/">Deploying Blueprints </a> </li> <li class="section"> - <a href="/v/latest/ops/index.html">Reference Guide + <a href="/v/latest/ops/">Reference Guide </a> </li> <li class="divider"></li> <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> @@ -212,11 +213,11 @@ <li class="dropdown"> - <a href="/community/index.html" data-toggle="dropdown">community <span class="caret"></span></a> + <a href="/community/" data-toggle="dropdown">community <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/community/index.html">Community</a> + <a href="/community/">Community</a> </li> <li class="divider"></li> @@ -236,7 +237,7 @@ <li > - <a href="/community/security/index.html">Security Advisories + <a href="/community/security/">Security Advisories </a> </li> @@ -257,8 +258,8 @@ <li > - <a href="/community/gsoc.html">Google Summer of Code - </a> + <a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy Policy + <span class="octicon octicon-link-external"></span></a> </li> @@ -269,17 +270,17 @@ <li class="dropdown active"> - <a href="/developers/index.html" data-toggle="dropdown">developers <span class="caret"></span></a> + <a href="/developers/" data-toggle="dropdown">developers <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/developers/index.html">Developers</a> + <a href="/developers/">Developers</a> </li> <li class="divider"></li> <li > - <a href="/developers/code/index.html">Get the Code + <a href="/developers/code/">Get the Code </a> </li> @@ -293,14 +294,14 @@ <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> <li > - <a href="/developers/committers/index.html">Committer Guide + <a href="/developers/committers/">Committer Guide </a> </li> @@ -340,7 +341,7 @@ <li class="dropdown"> - <a href="/download/index.html" class="btn btn-default navbar-btn">download</a> + <a href="/download/" class="btn btn-default navbar-btn">download</a> </li> @@ -359,76 +360,76 @@ <h2 id="the-basics">The Basics</h2> <p>The Apache Brooklyn source code is available at <a href="http://github.com/apache/brooklyn";>GitHub apache/brooklyn</a>, -together with many <a href="https://github.com/apache?query=brooklyn";><code>brooklyn-*</code> sub-module projects</a>. +together with many <a href="https://github.com/apache?query=brooklyn";><code class="language-plaintext highlighter-rouge">brooklyn-*</code> sub-module projects</a>. Checkout and build all the submodules with:</p> -<div class="highlight"><pre><code class="language-bash" data-lang="bash">git clone http://github.com/apache/brooklyn/ +<figure class="highlight"><pre><code class="language-bash" data-lang="bash">git clone http://github.com/apache/brooklyn/ <span class="nb">cd </span>brooklyn git submodule init -git submodule update --remote --merge --recursive -git submodule foreach <span class="s1">'git checkout master'</span> +git submodule update <span class="nt">--remote</span> <span class="nt">--merge</span> <span class="nt">--recursive</span> +git submodule foreach <span class="s1">'git checkout master'</span> -mvn clean install</code></pre></div> +mvn clean <span class="nb">install</span></code></pre></figure> -<p>This will produce an artifact in <code>brooklyn-dist/dist/brooklyn-dist-1.1.0-SNAPSHOT-dist.tar.gz</code> <!-- BROOKLYN_VERSION --> -which you can use <a href="/v/latest/start/running.html">in the usual way</a>. +<p>This will produce an artifact in <code class="language-plaintext highlighter-rouge">brooklyn-dist/dist/brooklyn-dist-1.2.0-SNAPSHOT-dist.tar.gz</code> <!-- BROOKLYN_VERSION --> +which you can use <a href="/guide/start/running.html">in the usual way</a>. Some options which may be useful:</p> <ul> - <li>Use <code>--depth 1</code> with <code>git clone</code> to skip the history (much faster but your <code>git log</code> will be incomplete)</li> - <li>Use <code>-DskipTests</code> with <code>mvn</code> to skip tests (again much faster but it wonât catch failures)</li> + <li>Use <code class="language-plaintext highlighter-rouge">--depth 1</code> with <code class="language-plaintext highlighter-rouge">git clone</code> to skip the history (much faster but your <code class="language-plaintext highlighter-rouge">git log</code> will be incomplete)</li> + <li>Use <code class="language-plaintext highlighter-rouge">-DskipTests</code> with <code class="language-plaintext highlighter-rouge">mvn</code> to skip tests (again much faster but it wonât catch failures)</li> <li>See below if you donât want to use submodules</li> </ul> <p>Thereafter to update the code in submodules, we strongly recommend doing this:</p> -<pre><code>git pull && git submodule update --remote --merge --recursive -</code></pre> +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git pull && git submodule update --remote --merge --recursive +</code></pre></div></div> <p>This merges the latest upstream changes into the current branch of each sub-module on your local machine, giving nice errors on conflicts. Itâs fine also to do branching and pulling in each submodule, -but running <code>update</code> without these parameters can cause chaos! -This <a href="git-more.html">page</a> elaborates on potential chaos and pitfalls, -and it provides instructions for setting up an alias <code>git sup</code> for this command.</p> +but running <code class="language-plaintext highlighter-rouge">update</code> without these parameters can cause chaos! +This <a href="/developers/code/git-more.html">page</a> elaborates on potential chaos and pitfalls, +and it provides instructions for setting up an alias <code class="language-plaintext highlighter-rouge">git sup</code> for this command.</p> <h3 id="if-you-cant-stand-submodules">If You Canât Stand Submodules</h3> -<p><a href="git-more.html#not-using-submodules">These instructions</a> can help setting up a local environment +<p><a href="/developers/code/git-more.html#not-using-submodules">These instructions</a> can help setting up a local environment which does not rely on submodules.</p> <h3 id="contributing-a-small-change">Contributing a Small Change</h3> <p>If youâre making a small change in one project, consider just using that project. -Whether you use this uber-project or not, to <a href="../how-to-contribute.html">contribute</a> +Whether you use this uber-project or not, to <a href="/developers/how-to-contribute.html">contribute</a> youâll need to follow the usual fork->work->push->pull-request process.</p> <p>To understand where you might want to make your change, -look at the <a href="/v/latest/dev/code/structure.html">code structure</a>.</p> +look at the <a href="/guide/dev/code/structure.html">code structure</a>.</p> <h3 id="bigger-and-regular-changes">Bigger and Regular Changes</h3> <p>Regular contributors will typically have their own fork for each of the submodule projects, -and will probably want some other settings and tips <a href="git-more.html">as described here</a>.</p> +and will probably want some other settings and tips <a href="/developers/code/git-more.html">as described here</a>.</p> <h2 id="next-steps">Next Steps</h2> <ul> <li> - <p>See the <a href="git-more.html">detailed Brooklyn & Git guide</a> to -<a href="git-more.html#set-up-forks">set up forks</a> or <a href="git-more.html#useful-aliases-and-commands">handy git aliases</a></p> + <p>See the <a href="/developers/code/git-more.html">detailed Brooklyn & Git guide</a> to +<a href="/developers/code/git-more.html#set-up-forks">set up forks</a> or <a href="/developers/code/git-more.html#useful-aliases-and-commands">handy git aliases</a></p> </li> <li> - <p>Visit the <a href="/v/latest/dev/">Developer Guide</a> has information on -<a href="/v/latest/dev/code/structure.html">project structure</a>, -<a href="/v/latest/dev/env/maven-build.html">Maven setup</a> and more</p> + <p>Visit the <a href="/guide/dev/">Developer Guide</a> has information on +<a href="/guide/dev/code/structure.html">project structure</a>, +<a href="/guide/dev/env/maven-build.html">Maven setup</a> and more</p> </li> <li> - <p>Review <a href="../how-to-contribute.html">How to Contribute</a> -to <a href="../how-to-contribute.html#contributor-license-agreement">file your CLA</a> + <p>Review <a href="/developers/how-to-contribute.html">How to Contribute</a> +to <a href="/developers/how-to-contribute.html#contributor-license-agreement">file your CLA</a> or -<a href="/v/latest/dev/code/structure.html">project structure</a>, -<a href="/v/latest/dev/env/maven-build.html">Maven setup</a> and more</p> +<a href="/guide/dev/code/structure.html">project structure</a>, +<a href="/guide/dev/env/maven-build.html">Maven setup</a> and more</p> </li> </ul> @@ -447,7 +448,7 @@ so we can remedy this!</p> <h4 class=""> - <a href="/developers/index.html" class="list-group-item breadcrumb breadcrumb0"> + <a href="/developers/" class="list-group-item breadcrumb breadcrumb0"> Developers </a></h4> @@ -455,7 +456,7 @@ so we can remedy this!</p> - <a href="/developers/code/index.html" class="list-group-item active with-sub-item">Get the Code + <a href="/developers/code/" class="list-group-item active with-sub-item">Get the Code </a> <div class="sub-item"> @@ -477,14 +478,14 @@ so we can remedy this!</p> - <a href="/v/latest/dev/index.html" class="list-group-item">Developer Guide + <a href="/v/latest/dev/" class="list-group-item">Developer Guide </a> - <a href="/developers/committers/index.html" class="list-group-item">Committer Guide + <a href="/developers/committers/" class="list-group-item">Committer Guide </a> @@ -707,8 +708,8 @@ so we can remedy this!</p> </div> <div class="col-md-3 text-right"> <p> - <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/website/developers/code/index.md";>Edit This Page</a> - <a href="https://brooklyn.apache.org/community/how-to-contribute-docs.html"; + <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/master/website/developers/code/index.md";>Edit This Page</a> + <a href="/community/how-to-contribute-docs.html" data-toggle="tooltip" data-placement="top" title="" data-delay="400" data-original-title="How to Edit Documentation"> <span class="octicon octicon-question octicon-footer"></span> </a> @@ -747,4 +748,5 @@ so we can remedy this!</p> ZeroClipboard.config({ moviePath: '/style/js/zeroclipboard/ZeroClipboard.swf' }); </script> <script src="/style/js/public.js"></script> + </html> Modified: brooklyn/site/developers/committers/index.html URL: http://svn.apache.org/viewvc/brooklyn/site/developers/committers/index.html?rev=1925014&r1=1925013&r2=1925014&view=diff ============================================================================== --- brooklyn/site/developers/committers/index.html (original) +++ brooklyn/site/developers/committers/index.html Fri Apr 11 07:44:54 2025 @@ -25,7 +25,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"; rel="stylesheet" /> +<link href="/style/deps/bootstrap.min.css" rel="stylesheet" /> <link href="/style/deps/octicons/octicons.css" rel="stylesheet" /> <link href="/style/deps/bootstrap-theme.css" rel="stylesheet" /> <link href="/style/deps/font-awesome-4.2.0/css/font-awesome.min.css" rel="stylesheet" /> @@ -33,7 +33,8 @@ <link href="/style/css/code.css" rel="stylesheet" /> <link href="/style/css/website.css" rel="stylesheet" /> -<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js";></script> +<script type="text/javascript" src="/style/deps/jquery.js"></script> + </head> <body class="page"> @@ -55,11 +56,11 @@ <li class="dropdown"> - <a href="/learnmore/index.html" data-toggle="dropdown">learn more <span class="caret"></span></a> + <a href="/learnmore/" data-toggle="dropdown">learn more <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/learnmore/index.html">Learn More</a> + <a href="/learnmore/">Learn More</a> </li> <li class="divider"></li> @@ -72,7 +73,7 @@ <li > - <a href="/learnmore/features/index.html">Features + <a href="/learnmore/features/">Features </a> </li> @@ -86,7 +87,7 @@ <li > - <a href="/learnmore/catalog/index.html">Browse Catalog + <a href="/learnmore/catalog/">Browse Catalog </a> </li> @@ -98,11 +99,11 @@ <li class="dropdown"> - <a href="/v/latest/start/index.html" data-toggle="dropdown">get started <span class="caret"></span></a> + <a href="/v/latest/start/" data-toggle="dropdown">get started <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/v/latest/start/index.html">Get Started</a> + <a href="/v/latest/start/">Get Started</a> </li> <li class="divider"></li> @@ -148,17 +149,17 @@ <li class="dropdown"> - <a href="/documentation/index.html" data-toggle="dropdown">documentation <span class="caret"></span></a> + <a href="/documentation/" data-toggle="dropdown">documentation <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/documentation/index.html">Documentation</a> + <a href="/documentation/">Documentation</a> </li> <li class="divider"></li> <li class="section"> - <a href="/v/latest/index.html">User Guide + <a href="/v/latest/">User Guide </a> </li> <li class="divider"></li> @@ -172,21 +173,21 @@ <li > - <a href="/v/latest/locations/index.html">Deploying Blueprints + <a href="/v/latest/locations/">Deploying Blueprints </a> </li> <li class="section"> - <a href="/v/latest/ops/index.html">Reference Guide + <a href="/v/latest/ops/">Reference Guide </a> </li> <li class="divider"></li> <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> @@ -212,11 +213,11 @@ <li class="dropdown"> - <a href="/community/index.html" data-toggle="dropdown">community <span class="caret"></span></a> + <a href="/community/" data-toggle="dropdown">community <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/community/index.html">Community</a> + <a href="/community/">Community</a> </li> <li class="divider"></li> @@ -236,7 +237,7 @@ <li > - <a href="/community/security/index.html">Security Advisories + <a href="/community/security/">Security Advisories </a> </li> @@ -257,8 +258,8 @@ <li > - <a href="/community/gsoc.html">Google Summer of Code - </a> + <a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy Policy + <span class="octicon octicon-link-external"></span></a> </li> @@ -269,17 +270,17 @@ <li class="dropdown active"> - <a href="/developers/index.html" data-toggle="dropdown">developers <span class="caret"></span></a> + <a href="/developers/" data-toggle="dropdown">developers <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/developers/index.html">Developers</a> + <a href="/developers/">Developers</a> </li> <li class="divider"></li> <li > - <a href="/developers/code/index.html">Get the Code + <a href="/developers/code/">Get the Code </a> </li> @@ -293,14 +294,14 @@ <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> <li > - <a href="/developers/committers/index.html">Committer Guide + <a href="/developers/committers/">Committer Guide </a> </li> @@ -340,7 +341,7 @@ <li class="dropdown"> - <a href="/download/index.html" class="btn btn-default navbar-btn">download</a> + <a href="/download/" class="btn btn-default navbar-btn">download</a> </li> @@ -362,7 +363,7 @@ <li> <a href="/developers/committers/merging-contributed-code.html">Merging Contributed Code</a> </li> -<li> <a href="/developers/committers/release-process/index.html">Release Process</a> </li> +<li> <a href="/developers/committers/release-process/">Release Process</a> </li> </ul></div> @@ -377,7 +378,7 @@ <h4 class=""> - <a href="/developers/index.html" class="list-group-item breadcrumb breadcrumb0"> + <a href="/developers/" class="list-group-item breadcrumb breadcrumb0"> Developers </a></h4> @@ -385,7 +386,7 @@ - <a href="/developers/code/index.html" class="list-group-item">Get the Code + <a href="/developers/code/" class="list-group-item">Get the Code </a> @@ -399,14 +400,14 @@ - <a href="/v/latest/dev/index.html" class="list-group-item">Developer Guide + <a href="/v/latest/dev/" class="list-group-item">Developer Guide </a> - <a href="/developers/committers/index.html" class="list-group-item active with-sub-item">Committer Guide + <a href="/developers/committers/" class="list-group-item active with-sub-item">Committer Guide </a> <div class="sub-item"> @@ -416,7 +417,7 @@ </a> - <a href="/developers/committers/release-process/index.html" class="list-group-item sub-item " > + <a href="/developers/committers/release-process/" class="list-group-item sub-item " > Release Process </a> @@ -642,8 +643,8 @@ </div> <div class="col-md-3 text-right"> <p> - <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/website/developers/committers/index.md";>Edit This Page</a> - <a href="https://brooklyn.apache.org/community/how-to-contribute-docs.html"; + <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/master/website/developers/committers/index.md";>Edit This Page</a> + <a href="/community/how-to-contribute-docs.html" data-toggle="tooltip" data-placement="top" title="" data-delay="400" data-original-title="How to Edit Documentation"> <span class="octicon octicon-question octicon-footer"></span> </a> @@ -682,4 +683,5 @@ ZeroClipboard.config({ moviePath: '/style/js/zeroclipboard/ZeroClipboard.swf' }); </script> <script src="/style/js/public.js"></script> + </html> Modified: brooklyn/site/developers/committers/merging-contributed-code.html URL: http://svn.apache.org/viewvc/brooklyn/site/developers/committers/merging-contributed-code.html?rev=1925014&r1=1925013&r2=1925014&view=diff ============================================================================== --- brooklyn/site/developers/committers/merging-contributed-code.html (original) +++ brooklyn/site/developers/committers/merging-contributed-code.html Fri Apr 11 07:44:54 2025 @@ -25,7 +25,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"; rel="stylesheet" /> +<link href="/style/deps/bootstrap.min.css" rel="stylesheet" /> <link href="/style/deps/octicons/octicons.css" rel="stylesheet" /> <link href="/style/deps/bootstrap-theme.css" rel="stylesheet" /> <link href="/style/deps/font-awesome-4.2.0/css/font-awesome.min.css" rel="stylesheet" /> @@ -33,7 +33,8 @@ <link href="/style/css/code.css" rel="stylesheet" /> <link href="/style/css/website.css" rel="stylesheet" /> -<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js";></script> +<script type="text/javascript" src="/style/deps/jquery.js"></script> + </head> <body class="page"> @@ -55,11 +56,11 @@ <li class="dropdown"> - <a href="/learnmore/index.html" data-toggle="dropdown">learn more <span class="caret"></span></a> + <a href="/learnmore/" data-toggle="dropdown">learn more <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/learnmore/index.html">Learn More</a> + <a href="/learnmore/">Learn More</a> </li> <li class="divider"></li> @@ -72,7 +73,7 @@ <li > - <a href="/learnmore/features/index.html">Features + <a href="/learnmore/features/">Features </a> </li> @@ -86,7 +87,7 @@ <li > - <a href="/learnmore/catalog/index.html">Browse Catalog + <a href="/learnmore/catalog/">Browse Catalog </a> </li> @@ -98,11 +99,11 @@ <li class="dropdown"> - <a href="/v/latest/start/index.html" data-toggle="dropdown">get started <span class="caret"></span></a> + <a href="/v/latest/start/" data-toggle="dropdown">get started <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/v/latest/start/index.html">Get Started</a> + <a href="/v/latest/start/">Get Started</a> </li> <li class="divider"></li> @@ -148,17 +149,17 @@ <li class="dropdown"> - <a href="/documentation/index.html" data-toggle="dropdown">documentation <span class="caret"></span></a> + <a href="/documentation/" data-toggle="dropdown">documentation <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/documentation/index.html">Documentation</a> + <a href="/documentation/">Documentation</a> </li> <li class="divider"></li> <li class="section"> - <a href="/v/latest/index.html">User Guide + <a href="/v/latest/">User Guide </a> </li> <li class="divider"></li> @@ -172,21 +173,21 @@ <li > - <a href="/v/latest/locations/index.html">Deploying Blueprints + <a href="/v/latest/locations/">Deploying Blueprints </a> </li> <li class="section"> - <a href="/v/latest/ops/index.html">Reference Guide + <a href="/v/latest/ops/">Reference Guide </a> </li> <li class="divider"></li> <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> @@ -212,11 +213,11 @@ <li class="dropdown"> - <a href="/community/index.html" data-toggle="dropdown">community <span class="caret"></span></a> + <a href="/community/" data-toggle="dropdown">community <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/community/index.html">Community</a> + <a href="/community/">Community</a> </li> <li class="divider"></li> @@ -236,7 +237,7 @@ <li > - <a href="/community/security/index.html">Security Advisories + <a href="/community/security/">Security Advisories </a> </li> @@ -257,8 +258,8 @@ <li > - <a href="/community/gsoc.html">Google Summer of Code - </a> + <a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy Policy + <span class="octicon octicon-link-external"></span></a> </li> @@ -269,17 +270,17 @@ <li class="dropdown active"> - <a href="/developers/index.html" data-toggle="dropdown">developers <span class="caret"></span></a> + <a href="/developers/" data-toggle="dropdown">developers <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li> - <a href="/developers/index.html">Developers</a> + <a href="/developers/">Developers</a> </li> <li class="divider"></li> <li > - <a href="/developers/code/index.html">Get the Code + <a href="/developers/code/">Get the Code </a> </li> @@ -293,14 +294,14 @@ <li > - <a href="/v/latest/dev/index.html">Developer Guide + <a href="/v/latest/dev/">Developer Guide </a> </li> <li > - <a href="/developers/committers/index.html">Committer Guide + <a href="/developers/committers/">Committer Guide </a> </li> @@ -340,7 +341,7 @@ <li class="dropdown"> - <a href="/download/index.html" class="btn btn-default navbar-btn">download</a> + <a href="/download/" class="btn btn-default navbar-btn">download</a> </li> @@ -360,7 +361,7 @@ repository layout:</p> <ul> - <li><a href="https://gitbox.apache.org/repos/asf?s=brooklyn";>Apache</a> - the main and official repository</li> + <li><a href="https://git-wip-us.apache.org/repos/asf?s=brooklyn";>Apache</a> - the main and official repository</li> <li><a href="https://github.com/apache/brooklyn";>GitHub</a> - mirror of the ASF repository, used to accept contributions and do code reviews</li> </ul> @@ -387,58 +388,58 @@ commit. Preserve both the name and emai <h2 id="setting-up-your-repository">Setting up your repository</h2> -<p>Follow <a href="../code/git-more.html">these instructions</a> to configure your local repositories. +<p>Follow <a href="/developers/code/git-more.html">these instructions</a> to configure your local repositories. Make sure the canonical ASF repo is enabled as that is where youâll need to push to merge changes, and that you are able to fetch pull-requests.</p> -<p>Once that is done, run <code>git fetch --all</code> to update from all remote repositories - you will see all the pull requests appear:</p> +<p>Once that is done, run <code class="language-plaintext highlighter-rouge">git fetch --all</code> to update from all remote repositories - you will see all the pull requests appear:</p> -<pre><code>* [new ref] refs/pull/98/head -> upstream/pr/1234 +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>* [new ref] refs/pull/98/head -> upstream/pr/1234 * [new ref] refs/pull/99/head -> upstream/pr/1235 -</code></pre> +</code></pre></div></div> <h2 id="merging-a-pull-request">Merging a pull request</h2> <p>Fetch the latest remote branches, which will cause a remote branch for the PR to become available to you.</p> -<pre><code>git fetch --all -</code></pre> +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git fetch --all +</code></pre></div></div> <p>If you want to inspect a particular PR and/or run tests, check out the branch:</p> -<pre><code>git checkout upstream/pr/1234 -</code></pre> +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout upstream/pr/1234 +</code></pre></div></div> <p>To perform the merge, first update your master branch to the latest:</p> -<pre><code>git checkout master +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout master git pull --rebase -</code></pre> +</code></pre></div></div> <p>Then merge and push:</p> -<pre><code>git merge --no-ff -m 'This closes #1234' upstream/pr/1234 +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git merge --no-ff -m 'This closes #1234' upstream/pr/1234 git push apache-git master -</code></pre> +</code></pre></div></div> <p>Note that this commit message is important, as this is what will trigger the -pull request to be automatically closed, and the <code>--no-ff</code> means that a merge +pull request to be automatically closed, and the <code class="language-plaintext highlighter-rouge">--no-ff</code> means that a merge commit will always be created.</p> <h2 id="alternative-options">Alternative options</h2> <h3 id="adding-the-remote-reference-to-the-contributors-repository">Adding the remote reference to the contributorâs repository</h3> -<p>Fetch the branch of the user you want to merge from (replacing <code>-PROJECT</code> as appropriate):</p> +<p>Fetch the branch of the user you want to merge from (replacing <code class="language-plaintext highlighter-rouge">-PROJECT</code> as appropriate):</p> -<pre><code>git fetch https://github.com/user-to-merge-from/brooklyn-PROJECT.git branch-to-merge-from -</code></pre> +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git fetch https://github.com/user-to-merge-from/brooklyn-PROJECT.git branch-to-merge-from +</code></pre></div></div> <p>If you commonly merge from a particular user, youâll want to add their repo as a remote to make fetching branches easier:</p> -<pre><code>git remote add user-to-merge-from https://github.com/user-to-merge-from/brooklyn-PROJECT.git +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git remote add user-to-merge-from https://github.com/user-to-merge-from/brooklyn-PROJECT.git git fetch user-to-merge-from -</code></pre> +</code></pre></div></div> <h3 id="merging-from-a-patch-file">Merging from a patch file</h3> @@ -447,8 +448,8 @@ keep the authorship of the commit, so we <p>Apply the patch preserving the original author:</p> -<pre><code>git am pull-request-9876.patch -</code></pre> +<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git am pull-request-9876.patch +</code></pre></div></div> <h2 id="additional-information">Additional information</h2> @@ -457,7 +458,7 @@ keep the authorship of the commit, so we <ul> <li><a href="https://www.apache.org/dev/new-committers-guide.html";>Guide for new project committers</a></li> <li><a href="https://www.apache.org/dev/committers.html";>Committers FAQ</a></li> - <li><a href="https://gitbox.apache.org/";>Git at Apache</a></li> + <li><a href="https://git-wip-us.apache.org/";>Git at Apache</a></li> </ul> @@ -472,12 +473,12 @@ keep the authorship of the commit, so we <h4 class=" with_following"> - <a href="/developers/index.html" class="list-group-item breadcrumb breadcrumb0"> + <a href="/developers/" class="list-group-item breadcrumb breadcrumb0"> Developers </a></h4> <h4 class=" with_preceding"> - <a href="/developers/committers/index.html" class="list-group-item breadcrumb breadcrumb1"> + <a href="/developers/committers/" class="list-group-item breadcrumb breadcrumb1"> Committer Guide </a></h4> @@ -492,7 +493,7 @@ keep the authorship of the commit, so we - <a href="/developers/committers/release-process/index.html" class="list-group-item">Release Process + <a href="/developers/committers/release-process/" class="list-group-item">Release Process </a> @@ -687,8 +688,8 @@ keep the authorship of the commit, so we </div> <div class="col-md-3 text-right"> <p> - <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/website/developers/committers/merging-contributed-code.md";>Edit This Page</a> - <a href="https://brooklyn.apache.org/community/how-to-contribute-docs.html"; + <a class="btn btn-sm btn-default" href="https://github.com/apache/brooklyn-docs/edit/master/website/developers/committers/merging-contributed-code.md";>Edit This Page</a> + <a href="/community/how-to-contribute-docs.html" data-toggle="tooltip" data-placement="top" title="" data-delay="400" data-original-title="How to Edit Documentation"> <span class="octicon octicon-question octicon-footer"></span> </a> @@ -727,4 +728,5 @@ keep the authorship of the commit, so we ZeroClipboard.config({ moviePath: '/style/js/zeroclipboard/ZeroClipboard.swf' }); </script> <script src="/style/js/public.js"></script> + </html>
