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