[Axiom-developer] Re: axiom--main--1--patch-31

[Mark Murray]

root writes:
> Merging whole branches is generally done by hand.
> But that's mostly my distrust of source code manipulatioin tools.
> My general method is to do:
> 
>   diff -r --brief oldbranch newbranch
> 
> and then do individual file diffs with hand merges. Source code
> is too important to let the tools change it. 

OK, given the ammount of stuff I needed to do, that was just not
feasible. I found out how to do it, and axiom--BSD--1 is now
near-identical to axiom--main--1.

I'm a heavy user of CVS, and one of the repository maintainers for
the FreeBSD sources, so I know it pretty well. Some of the things
you can't do easily in Arch are slowing me down a bit, but I'm
getting there.

> If you want to do it in an automated way I'd suggest hopping onto
> the tla IRC channel. There are some helpful people there.

OK
--
Mark Murray
iumop ap!sdn w,I idlaH