Re: [Axiom-developer] Merging build-improvements to trunk

[Gabriel Dos Reis]

On Tue, 12 Jun 2007, Ralf Hemmecke wrote:

| > "svk smerge" needs a "base" to start with; I have not look a the history
| > to pick a sensible common base yet.
| 
| I had once collected that data...
| 
| What do we have on Sourceforge?
| 
| trunk this was some snapshot of the axiom--main--1--patch-49 but it was later
| brought (nearly) in sync with --patch-50.
| 
| build-improvements   branched from trunk (r30)
| wh-sandbox           branched from build-improvements (r263)
| gdr-sandbox          branched from build-improvements (r335)
| daly                 branched from trunk (r6)
| 
| Ralf


Ralf --

  Many thanks!

  Given Ralf's accurate historical data above, I would like to amend my
previous statements: "svk merge" will work (and does) just fine.  I was able
to "forward port" Waldek's change from revision 242 to 243 -- renaming
poly.{,p}ht to polys.{,p}ht.

-- Gaby