3.0.4 RC4

[John W. Eaton]

On 20-Feb-2009, Rob Mahurin wrote:

| $ pwd
| /Users/rob/src/octave
| $ hg pull http://www.octave.org/hg/octave
| $ hg pull http://hg.tw-math.de/release-3-0-x
| $ hg branches
| default                     9175:fa981a053064
| release-3-0-x               9028:0bd0ac660964 (inactive)
| $ hg log -f | head
| changeset:   9175:fa981a053064
| $ hg checkout release-3-0-x
| 2698 files updated, 0 files merged, 830 files removed, 0 files  
| unresolved
| $ hg checkout default
| 2010 files updated, 0 files merged, 1518 files removed, 0 files  
| unresolved
| 
| Now both histories are in the same mercurial database.  This has  
| turned out useful in my projects where I use git, but none of them  
| are as large as octave.  We'll see what happens.

OK, I didn't know it was that simple to merge two archives.  But I
still don't think I want to keep the release branches in the same
archive with the main development sources.

jwe