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

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

Grzegorz B. Prokopski wrote:
> On (30/04/04 16:22), Chris Pickett wrote:
> 
>>Hi,
>>
>>As an experiment, I am preparing a tag for Greg or David to
>>merge into staging.  It will contain a compile-time option to enable
>>inflating all contended thin locks (currently this is not done; see back
>>in the list about how in some situations it might give you a small 
>>benefit).  The option is called --enable-full-lock-inflation.
> 
> 
> Firstly, how do I get the diff of your changes? I tried: 
> 
> svn diff
> svn+ssh://svn.sablevm.org/public/developers/chris/tags/inflate_thin_locks
> -r 2146 svn+ssh://svn.sablevm.org/public/sablevm/branches/staging |less
> 
> to compare your tag to the last revision of sablevm-staging you've
> merged but it seems to be showing lots of other stuff too, like
> lt_dlopen stuff Etienne merged lately from Melanie's sandbox,
> and I can't seem to find *your* changes.

Hi Greg,

One way that works to get a diff is this:

$ svn log $CHRIS/tags
------------------------------------------------------------------------
r2150 | chris | 2004-04-30 19:07:22 -0400 (Fri, 30 Apr 2004) | 2 lines

Create tag with --enable-full-lock-inflation for merging into staging.

------------------------------------------------------------------------
r2148 | chris | 2004-04-30 18:41:45 -0400 (Fri, 30 Apr 2004) | 2 lines

Destroy bad tag.

------------------------------------------------------------------------
r2139 | chris | 2004-04-29 20:08:04 -0400 (Thu, 29 Apr 2004) | 2 lines

Create staging branch to prepare inflate_thin_locks tag.

------------------------------------------------------------------------
r820 | egagnon | 2003-10-23 20:10:05 -0400 (Thu, 23 Oct 2003) | 2 lines

Add chris developer.

------------------------------------------------------------------------

$ svn diff $STAGING@2150 $CHRIS/tags/inflate_thin_locks@2150

(i find it's very helpful to set environment variables for commonly used 
directories in your .bashrc or .profile)

Possibly there is a better way to find the last changed revision.  A 
checkout followed by svn info will also tell you.

To merge them:

$ cd staging
$ svn merge $STAGING@2150 $CHRIS/tags/inflate_thin_locks@2150
$ svn diff
[ output should be the same as previous diff, except for the headers ]

Cheers,
Chris