thomas: doc/www/src mercurial.html.m4, NONE, 1.1 Makefile, 1.25, 1.26 cvs-kolab.html.m4, 1.15, 1.16 footer.html.m4, 1.47, 1.48 howto-kolab.html.m4, 1.3, 1.4 index.html.m4, 1.174, 1.175 kolabsearch.htm, 1.11, 1.12

cvs at kolab.org cvs at kolab.org
Mon Sep 6 15:36:50 CEST 2010


Author: thomas

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv25601

Modified Files:
	Makefile cvs-kolab.html.m4 footer.html.m4 howto-kolab.html.m4 
	index.html.m4 kolabsearch.htm 
Added Files:
	mercurial.html.m4 
Log Message:
Adjust web page for server development with Mercurial


--- NEW FILE: mercurial.html.m4 ---
m4_define(`PAGE_TITLE', `Mercurial repositories for Kolab')
m4_include(header.html.m4)
<div id="date">This page was updated on:<br />$Date: 2010/09/06 13:36:48 $</div>

<h1>Mercurial SCM</h1>

<p>
The Kolab project maintains a Mercurial server for version control of the Kolab
server code.

<div class="note">
Please report any development issues to the
<a href="/mailman/listinfo/kolab-devel">Kolab development mailing list</a>.
Please feel free to submit patches, documentation or anything else you can
think of that would help the project.
</div>

<h2>Web access and anonymous clone</h2>

<a href="http://hg.kolab.org/">http://hg.kolab.org/</a> allows browsing all
Mercurial repositories.

The Kolab Server development repository can be cloned via http:

<pre class="shell">
  hg clone http://hg.kolab.org/server
</pre>

If you want to update your local clone, you can use:

<pre class="shell">
  hg pull -u
</pre>

Further usage information for Mercurial can be found on the
<a href="http://mercurial.selenic.com/learn/">Learn Mercurial</a> page.


<h2>push access for developers</h2>

<pre class="shell">
  hg clone ssh://hg@hg.kolab.org/server
  (edit something)
  hg add foobar       # add new files
  hg commit           # commit your changes
  hg outgoing -vp     # show what would be pushed
  hg push             # publish your changes
</pre>

RSA key fingerprint of hg.kolab.org is
<code>a7:43:54:ab:bc:55:3f:05:76:30:59:67:7f:2c:df:df</code>.


<h2>Branches</h2>

<ul>
<li><strong>default</strong><p>
 Like HEAD in CVS or master in git; this branch is open for development.<br>
 To checkout use: <code>hg checkout default</code>
</p>
</li>
<li><strong>2.2-stable</strong><p>
 This is the current status of Kolab 2.2.x and is mainly used for bugfixes.<br>
 To checkout use: <code>hg checkout 2.2-stable</code>
 </p>
</li>
<li><strong>Other Branches</strong><p>
 There are many more branches, mainly of historic intrest and mostly inactive.
 To discover them all one can have a look at the
 <a href="http://hg.kolab.org/server/branches">branches page of the server
 repository</a>.
 </p>
</li>
</ul>

m4_include(footer.html.m4)

Index: Makefile
===================================================================
RCS file: /kolabrepository/doc/www/src/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	21 Apr 2008 09:35:44 -0000	1.25
+++ Makefile	6 Sep 2010 13:36:48 -0000	1.26
@@ -10,12 +10,13 @@
     howtos.html \
     mirrors.html \
     cvs-kolab.html \
+    mercurial.html \
     kolab2-clients.html \
     client-features.html \
     kolab-plugins.html \
     kolabsearch.html \
     documentation.html \
-	olddocumentation.html \
+    olddocumentation.html \
     i18n.html \
     webclient.html
 

Index: cvs-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cvs-kolab.html.m4	26 Mar 2010 11:44:14 -0000	1.15
+++ cvs-kolab.html.m4	6 Sep 2010 13:36:48 -0000	1.16
@@ -1,12 +1,13 @@
-m4_define(`PAGE_TITLE', `Server Development')
+m4_define(`PAGE_TITLE', `Kolab CVS repository')
 m4_include(header.html.m4)
 <div id="date">This page was updated on:<br />$Date$</div>
 
 <h1>CVS</h1>
 
 <p>
-The Kolab project maintains a CVS server for version control of the Kolab
-server code.
+The Kolab project maintains a CVS server for version control of Kolab
+documentation and this web site. Server development already moved to
+<a href="mercurial.html">Mercurial</a>, the remaining files will follow.
 
 <div class="note">
 Please report any development issues to the
@@ -33,32 +34,10 @@
 
 <pre class="shell">
 <b>Main Modules</b>
-    server: The Kolab Server
+    server: The Kolab Server (read-only)
     doc:    Documentation
     utils:  Various utilities
 </pre>
 </p>
-
-<h2>Branches</h2>
-
-<ul>
-<li><strong>Kolab-2 Development</strong><p>
- Also known as HEAD; this branch is open for development.<br>
- To checkout use : <code>cvs checkout</code>
-</p>
-</li>
-<li><strong>Kolab-2.2 Stable</strong><p>
- This is the current status of Kolab 2.2.x and is mainly used for bugfixes.<br>
- To checkout use : <code>cvs checkout -r kolab_2_2_branch modulename</code>
- </p>
-</li>
-<li><strong>Other Branches</strong><p>
- There are many more branches, mainly of historic intrest and mostly inactive.  
- To discover them all one can have a look at the "Show files using tag:" menu 
- at the button of the servers 
- <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/">view-cvs page</a>.
- </p>
-</li>
-</ul>
 
 m4_include(footer.html.m4)

Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- footer.html.m4	2 Mar 2010 15:21:41 -0000	1.47
+++ footer.html.m4	6 Sep 2010 13:36:48 -0000	1.48
@@ -86,7 +86,7 @@
 <a href="/pipermail/kolab-format/">Archive</a> |
 <a href="/mailman/listinfo/kolab-format">Subscribe/Manage</a>
 <br />
-CVS Commit Mailinglist:
+Kolab Commits Mailinglist:
 <br/>
 <a href="/pipermail/kolab-commits/">Archive</a> |
 <a href="/mailman/listinfo/kolab-commits">Subscribe/Manage</a>
@@ -95,6 +95,9 @@
 <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/">Browse CVS</a>
 <br />
 <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/utils/testing/">Testing-Utilities in CVS</a><br />
+<a href="mercurial.html">Mercurial SCM</a> |
+<a href="http://hg.kolab.org/">Browse</a>
+<br />
 </div>
 
 <!-- EXITS -->

Index: howto-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/howto-kolab.html.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- howto-kolab.html.m4	10 Jun 2004 22:48:34 -0000	1.3
+++ howto-kolab.html.m4	6 Sep 2010 13:36:48 -0000	1.4
@@ -6,8 +6,7 @@
 »$2
 ',`<a href="$1">$2</a>')')
 
-<p><em> The following instructions are aimed at the technical advanced
-administrator.</em>
+<p><em>The following instructions are outdated!</em>
 
 
 <h3>Install current Kolab Server release</h3>

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- index.html.m4	1 Jul 2010 13:35:02 -0000	1.174
+++ index.html.m4	6 Sep 2010 13:36:48 -0000	1.175
@@ -59,6 +59,23 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 <table>
+<tr><td class="newsd">September 6th, 2010</td>
+<td class="newsh">»
+  Kolab Server development switched to Mercurial SCM
+</td></tr>
+</table>
+<div class="newsb">
+  Kolab Server development switched from CVS to the distributed SCM
+  <a href="http://mercurial.selenic.com/">Mercurial</a>. The repositories are
+  available at <a href="http://hg.kolab.org/">hg.kolab.org</a>, which is
+  operated by <a href="http://kolabsys.com/">Kolab Systems</a>.
+  For details look at the <a href="mercurial.html">instructions for using
+  Mercurial for Kolab Server development</a>.<br>
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">July 1st, 2010</td>
 <td class="newsh">»
   Kolab Server 2.2.4 Final Release

Index: kolabsearch.htm
===================================================================
RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabsearch.htm	2 Mar 2010 15:21:41 -0000	1.11
+++ kolabsearch.htm	6 Sep 2010 13:36:48 -0000	1.12
@@ -564,13 +564,18 @@
 <a href="http://kolab.org/pipermail/kolab-format/">Archive</a> |
 <a href="http://kolab.org/mailman/listinfo/kolab-format">Subscribe/Manage</a>
 <br />
-CVS Commit Mailinglist:
+Kolab Commits Mailinglist:
 <br/>
 <a href="http://kolab.org/pipermail/kolab-commits/">Archive</a> |
 <a href="http://kolab.org/mailman/listinfo/kolab-commits">Subscribe/Manage</a>
 </small><br /><br />
-<a href="http://kolab.org/cvs-kolab.html">Kolab Server Development</a><br />
+<a href="cvs-kolab.html">CVS</a> |
 <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/">Browse CVS</a>
+<br />
+<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/utils/testing/">Testing-Utilities in CVS</a><br />
+<a href="mercurial.html">Mercurial SCM</a> |
+<a href="http://hg.kolab.org/">Browse</a>
+<br />
 </div>
 
 <!-- EXPERIMENTAL -->





More information about the commits mailing list