sablevm-developer

[Sablevm-developer] stack_layout.txt merge

[Chris P. <chr...@ma...>]

Hi Greg,

I have changes for stack_layout.txt from a while ago.  Can you check 
them and commit to staging?

svn merge 
svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_layout.txt 
svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/stack_layout.txt

Thanks,
Chris

Re: [Sablevm-developer] stack_layout.txt merge

[Etienne G. <gag...@uq...>]

Hi Chris,

Thanks.

Little suggestion:  For proposing merges, you could provide private tags 
(svn+ssh://svn.sablevm.org/developers/chris/tags/sometagname).  This 
way, you can continue working in your sandbox safely, without having to 
freeze modifications.  Very convenient.  :-)

Etienne


Chris Pickett wrote:
> Hi Greg,
> 
> I have changes for stack_layout.txt from a while ago.  Can you check 
> them and commit to staging?
> 
> svn merge 
> svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_layout.txt 
> svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/stack_layout.txt 
> 
> 
> Thanks,
> Chris
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by the new InstallShield X.
> 
>> From Windows to Linux, servers to mobile, InstallShield X is the
> 
> one installation-authoring solution that does it all. Learn more and
> evaluate today! http://www.installshield.com/Dev2Dev/0504
> _______________________________________________
> Sablevm-developer mailing list
> Sab...@li...
> https://lists.sourceforge.net/lists/listinfo/sablevm-developer
> 
> 

-- 
Etienne M. Gagnon, Ph.D.             http://www.info.uqam.ca/~egagnon/
SableVM:                                       http://www.sablevm.org/
SableCC:                                       http://www.sablecc.org/

Re: [Sablevm-developer] stack_layout.txt merge

[Chris P. <chr...@ma...>]

Etienne Gagnon wrote:
> Hi Chris,
> 
> Thanks.
> 
> Little suggestion:  For proposing merges, you could provide private tags 
> (svn+ssh://svn.sablevm.org/developers/chris/tags/sometagname).  This 
> way, you can continue working in your sandbox safely, without having to 
> freeze modifications.  Very convenient.  :-)

Sure, I can do that in the future.  I did actually do it before, for the 
uncommitted locking patch ... but didn't bother this time since freezing 
that one file has no impact on my work.

Cheers,
Chris

[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

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

[Chris P. <chr...@ma...>]

Grzegorz B. Prokopski wrote:
> W liście z nie, 13-06-2004, godz. 15:47, Chris Pickett pisze: 
>>svn merge 
>>svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_layout.txt 
>>svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/stack_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/stack_layout.txt 

Strange.  When I went into a fresh working copy of staging, and did the 
specified merge from inside /doc, it worked perfectly and without 
conflicts -- I would not give a merge command that I had not tried myself!

> 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.

Well the last change was at r2151 according to svn log.  If I understand 
merge correctly, you can make it behave identically to diff + patch if 
one of the source files (revisions) is identical to the target.  Perhaps 
your working copy of staging was not at the latest revision -- that's 
all I can think of.

I'll try to provide more unbreakable instructions next time.

> In any case - it's in staging now.
> 
> Thanks Chris for the effort you put in improving these docs.

No problem, thanks for committing it.  I shouldn't take too much credit 
though:  Etienne wrote most of my changes, I just took them from the 
mailing list and merged them together with David's original, and did a 
few edits.

Cheers,
Chris

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

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

[Chris P. <chr...@ma...>]

Grzegorz B. Prokopski wrote:
> W liście z pon, 14-06-2004, godz. 11:53, Chris Pickett pisze: 
> 
>>Grzegorz B. Prokopski wrote:
>>
>>>W liście z nie, 13-06-2004, godz. 15:47, Chris Pickett pisze: 
>>>
>>>>svn merge 
>>>>svn+ssh://svn.sablevm.org/public/sablevm/branches/staging/doc/stack_layout.txt 
>>>>svn+ssh://svn.sablevm.org/public/developers/chris/sandbox/sablevm/doc/stack_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/stack_layout.txt 
>>
>>Strange.  When I went into a fresh working copy of staging, and did the 
>>specified merge from inside /doc, it worked perfectly and without 
>>conflicts -- I would not give a merge command that I had not tried myself!
> 
> 
> 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.

Actually, now I'm just confused.  The "correct" way to do this is to 
make a tag, right?  So, now I have another file, doc/m4macros.txt.

Can I just do:

svn cp $CHRIS/sandbox/sablevm/doc/m4macros.txt $CHRIS/tags/m4macros.txt

??  Or do I have to do something like:

svn cp $STAGING $CHRIS/sandbox/m4macros_tag_preparation
svn co $CHRIS/sandbox/m4macros_tag_preparation/doc
cd doc
svn merge -r 1506:2541 $CHRIS/sandbox/sablevm/doc/m4macros.txt
svn ci
svn cp $CHRIS/sandbox/m4macros_tag_preparation 
$CHRIS/tags/m4macros_tag_preparation

which is what I have now done.  I don't know what revisions to give you, 
probably 2541:2543.  You can see with:

svn log $CHRIS/tags/m4macros_tag_preparation

(I misnamed the tag, oh well).  This second method feels too complicated 
for something so simple.

Chris