[Sablevm-developer] Re: stack_layout.txt merge

[Grzegorz B. P. <ga...@de...>]

W li=B6cie z nie, 13-06-2004, godz. 15:47, Chris Pickett pisze:=20
> Hi Greg,
>=20
> I have changes for stack_layout.txt from a while ago.  Can you check=20
> them and commit to staging?

I looked and they seem very good.

> svn merge=20
> svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_lay=
out.txt=20
> svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/s=
tack_layout.txt

Unfortunatelly this is not proper command to merge these changes (and it
does not work). If you can, please try to provide merge commands, like

svn merge -r xxxx:yyyy
svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/sta=
ck_layout.txt=20

I could not determine at which xxxx revision your stack_layout.txt merge
should start, and applying the diff from 1293:2524 was giving rejects,
so I decided to do the merge by hand.

In any case - it's in staging now.

Thanks Chris for the effort you put in improving these docs.

				Grzegorz B. Prokopski
--=20
Grzegorz B. Prokopski      <ga...@de...>
Debian GNU/Linux           http://www.debian.org
SableVM - LGPL'ed Java VM  http://www.sablevm.org
Why SableVM ?!?            http://devel.sablevm.org/wiki/Features