accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1504685 - /accumulo/site/trunk/content/source.mdtext
Date Thu, 18 Jul 2013 22:09:13 GMT
Author: kturner
Date: Thu Jul 18 22:09:12 2013
New Revision: 1504685

URL: http://svn.apache.org/r1504685
Log:
update source page to reference git

Modified:
    accumulo/site/trunk/content/source.mdtext

Modified: accumulo/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/source.mdtext?rev=1504685&r1=1504684&r2=1504685&view=diff
==============================================================================
--- accumulo/site/trunk/content/source.mdtext (original)
+++ accumulo/site/trunk/content/source.mdtext Thu Jul 18 22:09:12 2013
@@ -18,8 +18,8 @@ Notice:    Licensed to the Apache Softwa
 
 ##  Source Code
 
-Apache Accumulo™ source code is maintained using [Apache Subversion][subversion]
version control 
-([browse][viewvc]|[checkout][svnloc]).  It builds with [Apache Maven][maven].
+Apache Accumulo™ source code is maintained using [Git][gitscm] version control

+([browse][viewvc]).  It builds with [Apache Maven][maven].
 
 ## Website
 
@@ -39,12 +39,12 @@ will wait for you to enter a newline to 
 'thrift' command is in your path. Watch out for THRIFT-1367; you may need to configure Thrift
with
 --without-ruby.
 
-#### Checking out from svn
+#### Checking out from git
 
 
 To check out the code:
 
-    svn co https://svn.apache.org/repos/asf/accumulo/trunk/
+    git clone http://git-wip-us.apache.org/repos/asf/accumulo.git
 
 #### Building
 
@@ -75,25 +75,7 @@ Accumulo [tracks issues][jiraloc] with [
 
 ### Merging Practices
 
-Changes should be merged from earlier branches of Accumulo to later branches.  Currently,
all changes are being merged from the 1.4 branch and later, but not all changes are merged
from the 1.3 branch.  When you make a change in branch 1.x, use the following process to merge
to subsequent versions 1.y and 1.z:
-
-    svn merge -r 1:HEAD 1.x_svn_url 1.y_local_dir
-
-    examine merged files and conflicts
-
-    svn ci 1.y_local_dir
-
-    make sure the commit includes the svn mergeinfo
-
-    svn merge -r 1:HEAD 1.y_svn_url 1.z_local_dir
-
-    examine merged files and conflicts
-
-    svn ci 1.z_local_dir
-
-    make sure the commit includes the svn mergeinfo
-
-An additional step is now required to merge from 1.4 to 1.5 since the directory structure
changed.  Ask the dev list for instructions.
+Changes should be merged from earlier branches of Accumulo to later branches.  Ask the dev
list for instructions.
 
 ### Coding Practices
 
@@ -113,19 +95,18 @@ An additional step is now required to me
 ### Intellij Configuration Tips
  * Formatter [plugin](https://code.google.com/p/eclipse-code-formatter-intellij-plugin/)
that uses eclipse code style xml.
 
-### SVN
+### Git
 
- Instructions for configuring svn clients are [here](http://www.apache.org/dev/version-control.html#https-svn-config).
+ Instructions for configuring git are [here](https://git-wip-us.apache.org/).
 
 ### Release Guide
 Accumulo's release guide can be found [here][release].
 
-[subversion]: http://subversion.apache.org/
+[gitscm]: http://gitscm.com/
 [maven]: http://maven.apache.org/
-[viewvc]: http://svn.apache.org/viewvc/accumulo/
-[svnloc]: https://svn.apache.org/repos/asf/accumulo/trunk/
+[viewvc]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary
 [srcheaders]: http://www.apache.org/legal/src-headers.html
-[styles]: https://svn.apache.org/repos/asf/accumulo/trunk/contrib/
+[styles]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=contrib;h=e43cff51b721cf7fc48ce5e3cf5c9b25cd3d1166;hb=HEAD
 [jenkins]: http://jenkins-ci.org/
 [trunkbuild]: https://builds.apache.org/job/Accumulo-Trunk/
 [15build]: https://builds.apache.org/job/Accumulo-1.5.x/
@@ -136,4 +117,4 @@ Accumulo's release guide can be found [h
 [release]: /governance/releasing.html
 [cms]: http://www.apache.org/dev/cms.html
 [cmsusage]: http://www.apache.org/dev/cms.html#usage
-[cmsanon]: http://www.apache.org/dev/cmsref.html#non-committer
+[cmsanon]: http://www.apache.org/dev/cmsref.html#non-committer
\ No newline at end of file



Mime
View raw message