Re: [Sablevm-developer] Re: stack_layout.txt merge

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

W li=B6cie z pon, 14-06-2004, godz. 11:53, Chris Pickett pisze:=20
> Grzegorz B. Prokopski wrote:
> > W li=B6cie z nie, 13-06-2004, godz. 15:47, Chris Pickett pisze:=20
> >>svn merge=20
> >>svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_l=
ayout.txt=20
> >>svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc=
/stack_layout.txt
> >=20
> >=20
> > Unfortunatelly this is not proper command to merge these changes (and=
 it
> > does not work). If you can, please try to provide merge commands, lik=
e
> >=20
> > svn merge -r xxxx:yyyy
> > svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc=
/stack_layout.txt=20
>=20
> Strange.  When I went into a fresh working copy of staging, and did the=
=20
> specified merge from inside /doc, it worked perfectly and without=20
> conflicts -- I would not give a merge command that I had not tried myse=
lf!

Yup, I did that too and got some very cryptic message that a file is not
under revision control!  Yes, my local copy was up to date.

And getting back to your command - as merge is diff&patch in one, it
would basically take diff between current staging and your version, and
apply it to staging version.  The result would be the same, as if I just
overwrote staging version with your version.  I think this case is even
discussed somewhere in Subversion Book as an example of what you should
not do, if you really want to *merge* your changes.

HTH

				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