Bill Page wrote: > On Friday, October 27, 2006 9:08 AM Waldek Hebisch wrote: > > Also, /trunk has added ChangeLog to some subdirectories. > > > > Maybe we need to discuss this ChangeLog policy. At one > point Gaby started adding per directory ChangeLogs, but > Tim has only every used one central log. >
IMHO ChangeLog per directory is an overkill. Single ChangeLog is good for small or slowly changing project. I would prefer one ChangeLog per major subsystem (interp, algebra, graph, hyper ...). > > where ../axiom1/silver/axiom/ contains current SourceForge > > trunk and silver2 freshly checked out /silver. That gave me > > 1081 lines of differences. 201 lines are messages about > > .arch-ids subdirectories. > > > > Thanks. > > If you are able to identify and annonate the chunks of this > changeset that represent deletions, additions and those that > need further discussion, I think that would be great. Except > for the issue of the annoying '.arch-ids' files, I still think > the best approach to synchronize /silver and /trunk would be > for Tim to apply the necessary patchs to his tla archive > 'axiom--silver--1'. I think we need to get the workflow running > properly and automatically from axiom--silver--1 into /silver > and manually from /silver back to Tim as I suggested in a > previous email. > I think that as a one-time syncing operation we should apply Tim's changes to /trunk (and Tim should look at the (very small) difference). Once Tim's changes are in /trunk your robot can automatically update /trunk. Summary of the diff: there are 23 changed files. 8 files in /silver contains '\r' (carriage returns), but only 2 in /trunk '\r' in /trunk: zips/gcl-2.6.8pre2.cmpnew.gcl_cmpflet.lsp.patch zips/gcl-2.6.8pre.cmpnew.gcl_cmpflet.lsp.patch '\r' in /silver: silver2/zips/gcl-2.6.2a.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.2.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.3.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.5.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.5w.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.6.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.8pre2.cmpnew.gcl_cmpflet.lsp.patch silver2/zips/gcl-2.6.8pre.cmpnew.gcl_cmpflet.lsp.patch This explains 6 differences (we probably should remove '\r') from the remaining 2 files in /trunk Changes in SF /trunk, but not in SF /silver (file names + ChangeLog entries): 2006-10-25 Waldek Hebisch <[EMAIL PROTECTED]> * Makefile.pamphlet (${MID}/%.NRLIB/code.o): Remove old NRLIB src/algebra/Makefile.pamphlet hunk 1 2006-09-15 Gabriel Dos Reis <[EMAIL PROTECTED]> * tla-1.1.tar.gz: Remove. Changes in /silver but not in /trunk (log entry + file): No log entry FAQ No log entry (move --interaction nonstopmode as first argument to latex) Makefile Makefile.pamphlet src/doc/Makefile.pamphlet 20061026 tpd README add Christian Aistleitner 20061018 tpd README fix baldir -> balbir 20061006 tpd README add Waldek Hebisch 20060926 tpd README add Frithjof Schulze 20060914 tpd README add Jose Alfredo Portes README 20060909 tpd src/algebra/catdef.spad document Semigroup src/algebra/catdef.spad.pamphlet 20061009 wxh src/algebra/efstruc.spad.pamphlet fix goodCoef src/algebra/efstruc.spad.pamphlet 20061018 wsp src/algebra/Makefile change \$ to $ for awk scripts src/algebra/Makefile.pamphlet hunk 2 and 3 20060919 gxv src/doc/book line 15282, remove verbatim src/doc/book.pamphlet 20061017 gxv src/interp/bookvol5 clearCmdparts -> clearCmdParts src/interp/bookvol5.pamphlet 20060904 tpd src/interp/debugsys.lisp fix paren balance src/interp/debugsys.lisp.pamphlet 20060901 tpd src/interp/nlib.lisp (probe-file => (directory (truename 20060906 cxm src/interp/nlib.lisp (and (directory filearg... src/interp/nlib.lisp.pamphlet 20060902 tpd src/interp/nocompil.lisp fix trailing paren in enable-backtrace src/interp/nocompil.lisp.pamphlet 20060906 cxm src/interp/nlib.lisp (and (directory filearg... src/interp/nlib.lisp.pamphlet 20060901 tpd src/interp/patches.lisp use namestring src/interp/patches.lisp.pamphlet 20060914 tpd src/interp/setq.lisp add Jose Alfredo Portes 20060926 tpd src/interp/setq.lisp add Frithjof Schulze 20061006 tpd src/interp/setq.lisp add Waldek Hebisch 20061018 tpd src/interp/setq.lisp fix baldir -> balbir 20061026 tpd src/interp/setq.lisp add Christian Aistleitner src/interp/setq.lisp.pamphlet 20061026 tpd src/interp/sockio.lisp use double on sock_send_float src/interp/sockio.lisp.pamphlet -- Waldek Hebisch [EMAIL PROTECTED] _______________________________________________ Axiom-developer mailing list Axiom-developer@nongnu.org http://lists.nongnu.org/mailman/listinfo/axiom-developer