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