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

[Grzegorz B. P. <ga...@de...>]

On (30/04/04 17:34), Chris Pickett wrote:
> 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?

Well, assuming the result would be just the same, as if you did the
merge in the right place - then sure. But why not do it the right
way, in the right place in the first place?

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

The merge policy is getting especially important when merging things
into staging and further.  There's nothing that prevents you from being
inacurrate and messy in your own sandbox.  If you think that this
information is good enough for you - then, I think it's fine.

The reason why merge policy forbids modifications not strictly necessary
to the merge itself is, as I read it, that if the merge gets reverted
for any reason - these changes are lost.  The other reason is that if
you want to repeat the merge in another place/time, you know exactly
what was merged by looking at the log message.

In short: it's just much better and easier to abide by the policy ;-)

Cheers,

				GBP

-- 
Grzegorz B. Prokopski <ga...@de...>
Debian GNU/Linux      http://www.debian.org
SableVM - LGPLed JVM  http://www.sablevm.org
Why SableVM ?!?       http://devel.sablevm.org/wiki/WhySableVM