You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/02/26 02:14:56 UTC
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/671
Change subject: update site editing instructions
......................................................................
update site editing instructions
Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
---
M content/site.html
M site.md
2 files changed, 17 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/71/671/1
diff --git a/content/site.html b/content/site.html
index aaf6347..392557c 100644
--- a/content/site.html
+++ b/content/site.html
@@ -123,10 +123,13 @@
<h2 id="making-a-change-to-the-site">Making a change to the site</h2>
-<p>The general overview is as follows:
-- Make edits and check the output of ‘jekyll build’
-- Commit the change and propose it for review
-- Either wait for a review, or submit the change</p>
+<p>The general overview is as follows:</p>
+
+<ul>
+ <li>Make edits and check the output of <code>jekyll build</code></li>
+ <li>Commit the change and propose it for review</li>
+ <li>Either wait for a review, or submit the change</li>
+</ul>
<h3 id="editing-and-viewing-the-change">Editing and viewing the change.</h3>
@@ -150,12 +153,12 @@
<p>When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site branch:</p>
-<pre><code> ➤ git pull gerrit
+<pre><code> ➤ git pull --rebase gerrit asf-site
</code></pre>
-<p>Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this with care! ASF git doesn’t allow hard resets on branches, so whatever you push here is final.</p>
+<p>Then, push the <code>asf-site</code> branch to the ASF git repository. Do this with care! ASF git doesn’t allow hard resets on branches, so whatever you push here is final.</p>
-<pre><code> ➤ git push origin (SHA1 of submitted commit)
+<pre><code> ➤ git push origin asf-site
</code></pre>
diff --git a/site.md b/site.md
index f4f7487..e1ba5fd 100644
--- a/site.md
+++ b/site.md
@@ -36,9 +36,10 @@
## Making a change to the site
The general overview is as follows:
-- Make edits and check the output of 'jekyll build'
-- Commit the change and propose it for review
-- Either wait for a review, or submit the change
+
+* Make edits and check the output of `jekyll build`
+* Commit the change and propose it for review
+* Either wait for a review, or submit the change
### Editing and viewing the change.
@@ -65,12 +66,12 @@
When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site branch:
- ➤ git pull gerrit
+ ➤ git pull --rebase gerrit asf-site
-Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
+Then, push the `asf-site` branch to the ASF git repository. Do this with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
- ➤ git push origin (SHA1 of submitted commit)
+ ➤ git push origin asf-site
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: update site editing instructions
......................................................................
Patch Set 1: Code-Review-1
I don't really think the instruction about the pushing is necessarily correct. asf-site may or may not be the content of what is in Gerrit. It's not as big of a deal now that we can rewrite commits, but the sha1 is unambiguous.
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: update site editing instructions
......................................................................
Patch Set 1:
For me the script itself breaks:
Fetching latest state from Gerrit
Fetching latest state from https://git-wip-us.apache.org/repos/asf/incubator-incubator-asterixdb-site
fatal: repository 'https://git-wip-us.apache.org/repos/asf/incubator-incubator-asterixdb-site/' not found
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: update site editing instructions
......................................................................
Patch Set 1:
But the sha1 doesn't work for me. Could you try following the instructions and see if they work for you as currently written?
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: update site editing instructions
......................................................................
Patch Set 1:
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asf-site/28/ : SUCCESS (skipped)
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has abandoned this change.
Change subject: update site editing instructions
......................................................................
Abandoned
Ian's change with better instructions was merged.
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: abandon
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: update site editing instructions
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asf-site/28/
--
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No