You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/03/16 15:55:19 UTC
[1/2] incubator-quarks git commit: Adjust "github use" doc based on
feedback.
Repository: incubator-quarks
Updated Branches:
refs/heads/master 8613b8c85 -> 4f52a418a
Adjust "github use" doc based on feedback.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/c2b47767
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/c2b47767
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/c2b47767
Branch: refs/heads/master
Commit: c2b4776799bb03fbcb5830d967f4c806ba7d1a72
Parents: 0fccf26
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Mar 16 10:04:58 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Mar 16 10:04:58 2016 -0400
----------------------------------------------------------------------
DEVELOPMENT.md | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c2b47767/DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index ecb08bf..b8b1d23 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -102,7 +102,10 @@ In general most code is expected to work on Android (but might not yet) with the
### The ASF / Github Integration
-The Quarks code is in ASF resident git repositories.
+The Quarks code is in ASF resident git repositories:
+
+ https://git-wip-us.apache.org/repos/asf/incubator-quarks.git
+
The repositories are mirrored on github:
https://github.com/apache/incubator-quarks
@@ -113,14 +116,16 @@ for both committers and non-committers.
For a description of the github workflow see:
+ https://guides.github.com/introduction/flow/
https://guides.github.com/activities/hello-world/
In summary:
* fork the incubator-quarks github repository
* clone your fork, use lightweight per-task branches, and commit / push changes to your fork
- * name your branch quarks-xxxx - typically xxxx is a Jira ticket number
+ * descriptive branch names are good. You can also include a reference
+ to the Jira issue. e.g., mqtt-ssl-quarks-100 for issue QUARKS-100
* when ready, create a pull request. Committers will get notified.
- * include QUARKS-XXXX in the name of your pull request
+ * include QUARKS-XXXX (the Jira issue) in the name of your pull request
* for early preview / feedback, create a pull request with [WIP] in the title.
Committers won’t consider it for merging until after [WIP] is removed.
@@ -133,7 +138,6 @@ into the repo at the ASF. One way is described here:
http://mail-archives.apache.org/mod_mbox/incubator-quarks-dev/201603.mbox/%3C1633289677.553519.1457733763078.JavaMail.yahoo%40mail.yahoo.com%3E
Notes with the above PR merge directions:
- * seems like it should be using `git merge --squash pr-<N>`
* use an https url unless you have a ssh key setup at github:
`git remote add mirror https://github.com/apache/incubator-quarks.git`
@@ -155,5 +159,10 @@ into your Eclipse workspace directly from your fork.
1. Select Import existing Eclipse projects and click Next
1. In the Import Projects window, make sure that the Search for nested projects checkbox is selected. Click Finish to bring in all Quarks projects
+The project `_quarks` exists to make the top level artifacts such as
+`build.xml` manageable via Eclipse. Unfortunately folders for the
+other projects (e.g., `api`) also show up in the `_quarks` folder and
+are best ignored.
+
Note. Specifics may change depending on your version of Eclipse or the Eclipse Git Team Provider.
[2/2] incubator-quarks git commit: Merge pull request #15
Posted by dl...@apache.org.
Merge pull request #15
This closes #15
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/4f52a418
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/4f52a418
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/4f52a418
Branch: refs/heads/master
Commit: 4f52a418ac844b21016e22358422f05cbc0da1fa
Parents: 8613b8c c2b4776
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Mar 16 10:53:54 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Mar 16 10:53:54 2016 -0400
----------------------------------------------------------------------
DEVELOPMENT.md | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------