[Axiom-developer] Merging build-improvements to trunk

[Gabriel Dos Reis]

Hi,

  Last night I tried to do a merge of simple patches of Waldek (e.g. renaming 
of poly.ht to polys.ht) to trunk, but failed.  I must confess right
away that I do not have full access to my development environment andI was
trying all this operation remotely from a windows machine with a flaky
network connection.  I use SVK (an SVN client), which in many 
regards is higher level than bare SVN.  I did not succeet but mostly,
I believe, because I was not patient enough and because I did not have
good access to my machine.  I'll not try similar operations before
a while.  So, this is just a note that I tried something and I did not
succeed. 

  "svk merge" will not succeed because axiom.build-improvements was 
branched from something we called "silver" at the time, which no longer exists
(a long time ago), and axiom.trunk seems to come from something else
-- at least that is what I seem to have from the history, maybe I get that
part wrong.

  "svk smerge" needs a "base" to start with; I have not look a the history
to pick a sensible common base yet.

That is all.

-- Gaby