[ff-cvs] fenfire ./Makefile docs/pegboard/cvs_to_tla--tj...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/29 10:49:23

Modified files:
        .              : Makefile 
        docs/pegboard/cvs_to_tla--tjl: peg.rst 
        org/fenfire/fenpdf: demospace.py 
Added files:
        docs/official  : InBCT-2.1-2004-plan.txt oske-2004.txt 

Log message:
        Arch sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/official/InBCT-2.1-2004-plan.txt?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/official/oske-2004.txt?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/demospace.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.45 fenfire/Makefile:1.46
--- fenfire/Makefile:1.45       Wed Sep  3 07:19:14 2003
+++ fenfire/Makefile    Mon Sep 29 10:49:21 2003
@@ -142,9 +142,15 @@
 
 ######
 # TAGS
-TAGS:
+TAGS: TAGS_tla
+
+TAGS_cvs:
        if [ -f "../TAGS" ]; then rm ../TAGS; fi
        cd .. && find fenfire libvob alph callgl glmosaictext alph storm 
navidoc -type d -name CVS -exec sed -e '/^[^/]/d' -e 's:^\(/[^/]*\).*:{}\1:' -e 
's:/CVS/:/:' {}/Entries \;|xargs etags --append
+
+TAGS_tla:
+       if [ -f "../TAGS" ]; then rm ../TAGS; fi
+       cd .. && for dir in fenfire libvob alph callgl glmosaictext alph storm 
navidoc; do tla inventory --source $$dir; done|xargs etags --append
 
 tags:
        ctags -R metacode docs lava org
Index: fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst
diff -u fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.8 
fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.9
--- fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.8   Wed Sep 17 12:57:26 2003
+++ fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst       Mon Sep 29 10:49:22 2003
@@ -20,14 +20,26 @@
 
     RESOLVED: Irrelevant for this PEG
 
+- Should **everything** be done in arch?
+
+    RESOLVED: No. Some things are more hassle than necessary there.
+    ``manuscripts`` and ``spaces`` shall still be primarily
+    handled through CVS, and mirrored to arch.
+
 Changes
 =======
 
 (to be moved to docs/ upon acceptance)
 
 The fenfire projects will be moved out of CVS and into arch.
-CVS commits will be disabled except for project managers: mirroring
-the arch trees to CVS is desirable.
+CVS commits will be **strongly discouraged** except for project managers, 
+and except for PEGs: mirroring the arch trees to CVS is desirable.
+Exception::
+
+    manuscripts
+    spaces
+
+will be through CVS.
 
 The arch categories 
 of the projects will be named with the current CVS directory names::
@@ -295,12 +307,22 @@
                                    you're up to date
 
     tla star-merge address@hidden/fenfire--dev--0.1 .
+    tla commit -L"Merge"
 
 Make note of all 'C' messages and do ::
 
     find . -name '*.rej'
 
 afterwards to make sure nothing went wrong.
+
+**IMPORTANT**: To get "clean commits" as described in the tla documentation, 
+**never** star-merge on a dirty tree, i.e. always commit your local
+changes *first*, and **only then**, star-merge.
+This helps you as well: if something goes wrong with the star-merge,
+tla undo will wipe out only the star-merge instead of your changes
+as well. The clean changesets help the maintainer understand what
+you're doing.
+
 
 
 Initial Patch policy
Index: fenfire/org/fenfire/fenpdf/demospace.py
diff -u fenfire/org/fenfire/fenpdf/demospace.py:1.3 
fenfire/org/fenfire/fenpdf/demospace.py:1.4
--- fenfire/org/fenfire/fenpdf/demospace.py:1.3 Wed Sep 10 09:00:46 2003
+++ fenfire/org/fenfire/fenpdf/demospace.py     Mon Sep 29 10:49:22 2003
@@ -28,6 +28,7 @@
 
     noteA1 = Nodes.get(ppActions.newNote(paperA, -30,-30, 'This is a test!'))
     noteA2 = Nodes.get(ppActions.newNote(paperA, -60,-70, 'This is a test2!'))
+    noteA2 = Nodes.get(ppActions.newNote(paperA, -60,-100, 
'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789'))
     noteA3 = Nodes.get(ppActions.newNote(paperA, 100, 100, ''))
     noteA4 = Nodes.get(ppActions.newNote(paperA, -60,70, 'This is a very long 
test which is used to see if '))
 
@@ -40,10 +41,12 @@
 
 
     noteB1 = Nodes.get(ppActions.newNote(paperB, 1000,500, 'This is an another 
test!'))
+    noteA2 = Nodes.get(ppActions.newNote(paperB, 1000,600, 
'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789'))
 
     ppActions.assocNotes(noteA1, 1, noteB1)
 
     noteHome = Nodes.get(ppActions.newNote(paperHome, 0, 0, 'HOME'))
+    noteA2 = Nodes.get(ppActions.newNote(paperHome, 0,100, 
'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789'))
 
     ppActions.assocNotes(noteHome, 1, noteA1)