Re: [Sablevm-developer] branch permissions and tag creation

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

Hi Etienne,

Okay, thanks.  So just two more quick questions:

1) Under the new merge policy, is it acceptable to create the 
inflate_thin_locks/ branch in my sandbox, copy the merged changes from 
the working copy of the tag I just created, and then commit that with a 
"Merged ..." message?

2) I merged '-r 2132:2143 sandbox/sablevm/' into my 
tags/inflate_thin_locks/ working copy.  During the merge, I noticed 
there were some very small changes or comments I needed to add.  I added 
the comments to my main sandbox/sablevm/ branch as well as the 
tags/inflate_thin_locks/ branch, and committed the changes in 
sandbox/sablevm/ as r2144.

I was planning to write something like

"Merged with command:
svn -r 2132:2144 ..."

as my log message.  Is that sort of thing okay?  Or would I need to do 
two merges in this case?

Cheers,
Chris

Etienne Gagnon wrote:
> Hi Chris,
> 
> You can't modify a tag.  A tag is a "snapshot".
> 
> You should make the changes in your sandbox, e.g.
> 
> 
> svn cp svn+ssh://svn.sablevm.org/public/sablevm/branches/staging \
> svn+ssh://svn.sablevm.org/public/developer/chris/sandbox/inflate_thin_locks
> 
> svn co ...
> svn merge ...
> svn ci
> 
> Then,
> 
> svn cp
> svn+ssh://svn.sablevm.org/public/developer/chris/sandbox/inflate_thin_locks
> svn+ssh://svn.sablevm.org/public/developer/chris/tags/inflate_thin_locks
> 
> You can create (svn cp) and delete (svn rm) tags, but you can't modify them.
> 
> Etienne
>