[Pingus-CVS] CVS: Games/Pingus MAINTAINING,1.2,1.3

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus
In directory dark:/tmp/cvs-serv27931

Modified Files:
        MAINTAINING 
Log Message:
some info on CVS usage


Index: MAINTAINING
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/MAINTAINING,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MAINTAINING 18 Oct 2003 10:49:42 -0000      1.2
+++ MAINTAINING 1 Nov 2003 21:34:02 -0000       1.3
@@ -63,4 +63,20 @@
  * http://czyborra.com/charsets/iso8859.html
 
 
+CVS Usage
+~~~~~~~~~
+
+$ cvs co -r pingus_0_6 # old
+$ cvs co -r HEAD # current
+
+Merging changes:
+
+Edit pingus_0_6, commit as normal. Then goto HEAD and do:
+
+$ cvs update -kk -j pingus_0_6_merged_to_head -j pingus_0_6
+
+finally go back to pingus_0_6 and do:
+
+$ cvs tag pingus_0_6_merged_to_head
+
 # EOF #