[Axiom-developer] Re: Old trunk changes

[Ralf Hemmecke]

On 06/04/2007 02:54 PM, Gabriel Dos Reis wrote:
> Ralf --
>
>   Looking at the ChangeLog in trunk, I see changes dated:
>
>
>    2006-09-14  Ralf Hemmecke  <address@hidden>
>    2006-09-13  Ralf Hemmecke  <address@hidden>
>    2006-07-31  Ralf Hemmecke  <address@hidden>
>
> Do you know whether they have made it to Tim's branch?

----------------------------------------------------------------------
r70 (orig r71):  dos-reis | 2006-08-01 03:39:13 +0200
Changed paths:
  M  /axiom/trunk/axiom/src/algebra/ChangeLog
  M  /axiom/trunk/axiom/src/algebra/transsolve.spad.pamphlet

2006-07-31  Ralf Hemmecke  <address@hidden>

        * transsolve.spad.pamphlet: Escape "#".

woodpecker:~/SVK/axiom>cmp
branches/daly/axiom/src/algebra/transsolve.spad.pamphlet
trunk/axiom/src/algebra/transsolve.spad.pamphlet

No differences.
===========================================================


woodpecker:~/SVK/axiom/branches>svk mirror -l |grep axiom
/mirror/axiom           https://axiom.svn.sourceforge.net/svnroot/axiom

woodpecker:~/SVK/axiom/branches>svk log -r136 /mirror/axiom/
----------------------------------------------------------------------
r136 (orig r137):  hemmecke | 2006-09-14 12:28:32 +0200

Corrected corrupted binary files by taking the corresponding files from 
from axiom--main--1--patch-50.
----------------------------------------------------------------------

I hope this is what you meant.

svk log -v -r136 /mirror/axiom/ | grep /axiom/trunk/ | sed 
's/.*\/axiom\/trunk\/axiom\//sh rhxcmp /' > aaa
echo "cmp daly/axiom/\$1 build-improvements/\$1" > rhxcmp
sh aaa
cmp: daly/axiom/ChangeLog: No such file or directory
cmp: build-improvements/zips/tla-1.1.tar.gz: No such file or directory
===========================================================


I also compared with the version of trunk before you merged 
branches/daly to trunk.

woodpecker:~/SVK/axiom/trunk>svk log -r HEAD
----------------------------------------------------------------------
r197 (orig r198):  whebisch | 2006-10-25 22:15:28 +0200

Makefile fix

----------------------------------------------------------------------
Then commands similar to the things above yielded.
woodpecker:~/SVK/axiom>sh aaa
cmp: branches/daly/axiom/ChangeLog: No such file or directory
branches/daly/axiom/src/share/algebra/libaxiom.al 
trunk/axiom/src/share/algebra/libaxiom.al differ: byte 91, line 3
cmp: trunk/axiom/zips/tla-1.1.tar.gz: No such file or directory

I wouldn't care much about libaxiom.al. In fact, I believe, that it can 
currently be removed. It will be created by Peter Broadbery's script to 
make Aldor available for Axiom 
(http://wiki.axiom-developer.org/AldorForAxiom).
===========================================================

What you mean by

>    2006-09-13  Ralf Hemmecke  <address@hidden>

is not exactly clear to me (a revision number would have been clearer).

I guess you meant
woodpecker:~/SVK/axiom/trunk>svk log -r 135
----------------------------------------------------------------------
r135 (orig r136):  hemmecke | 2006-09-14 09:54:27 +0200

Removed svn:keywords from all files and svn:eol-style from selected files.
----------------------------------------------------------------------

cd SVK/axiom
echo "svk proplist /mirror/axiom/branches/daly/\$1"> rhxpl

svk log -v -r135 /mirror/axiom/ | grep /axiom/trunk/ | sed 
's/.*\/axiom\/trunk\//sh rhxpl /' > aaa

woodpecker:~/SVK/axiom>sh aaa > bbb
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/lsp/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/algebra/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/algebra/Lattice.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/boot/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/doc/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/doc/diagrams.tex'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/graph/include/all_2d.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/graph/include/all_3d.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/graph/include/all_alone.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Delta.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Gamma.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Im.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Lambda.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Omega.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Phi.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Pi.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Psi.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Re.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Sigma.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Theta.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Upsilon.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/Xi.bitmap'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/bitmaps/ht_icon'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/form_ext.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/parse_aux.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/parse_input.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/parse_paste.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/parse_types.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/hyper/show_types.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/all_hyper_proto.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/fnct_key.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/form_ext.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/parse_aux.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/parse_input.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/parse_paste.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/parse_types.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/show_types.H1'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/include/useproto.h'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/input/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/anna.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/construc.lisp.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/domain.lisp.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/guess.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/interp-fix.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/nhyper.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/pf2atree.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/redefs.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/word.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/xrun.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/interp/xruncomp.boot.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/lib/ChangeLog'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/src/lib/fnct_key.c.pamphlet'
Filesystem has no item: File not found: revision 583, path 
'/axiom/branches/daly/axiom/zips/ChangeLog'

woodpecker:~/SVK/axiom>sort bbb|uniq |head
  svn:eol-style
  svn:executable
  svn:keywords
  svn:mime-type
Properties on /mirror/axiom/branches/daly/axiom/CHANGELOG:
Properties on /mirror/axiom/branches/daly/axiom/FAQ:
Properties on /mirror/axiom/branches/daly/axiom/Makefile.pamphlet:
Properties on /mirror/axiom/branches/daly/axiom/Makefile:
Properties on /mirror/axiom/branches/daly/axiom/README:
Properties on /mirror/axiom/branches/daly/axiom/configure:

So it seems the keywords are all gone which means that the revision is 
also in branches/daly.

woodpecker:~/SVK/axiom/branches/daly>svk log -rHEAD
----------------------------------------------------------------------
r582 (orig r582):  daly | 2007-06-03 06:36:10 +0200

merge input test case branch changes
=======================================================

Hope, that helped.

Ralf