Release Trac 1.0.11

[Ryan J Ollos]

This ticket is used to coordinate the finalization and testing of the next stable version of Trac, 1.0.11.

[Ryan J Ollos]

DONE I'm considering modifying TracDev/DevelopmentWorkflow#Integrationinreleasebranches. In the time I've been involved with the project I've never seen anyone port all pending changes between branches, although I can't definitely say this hasn't happened since we don't have full visibility into the client-side operations. Instead, we seem to always do cherry-pick merges: svn merge -c uvw,yxz ^/branches/1.0-stable .

DONE It would also be good to document the process for committing work from a Git repository to SVN (comment:11:ticket:11189).

DONE TracDev/SubmittingPatches could describe the steps for contributors to submit work through a branch of GitHub (comment:11:ticket:11028). This was mentioned in comment:10:ticket:12171.

[Ryan J Ollos]

Replying to Ryan J Ollos:

I'm considering modifying TracDev/DevelopmentWorkflow#Integrationinreleasebranches. In the time I've been involved with the project I've never seen anyone port all pending changes between branches, although I can't definitely say this hasn't happened since we don't have full visibility into the client-side operations. Instead, we seem to always do cherry-pick merges: svn merge -c uvw,yxz ^/branches/1.0-stable .

Below is the diagram output by the mergeinfo command, for ^/branches/trunk relative to ^/branches/1.0-stable. ^/branches/1.0-stable was created in r11308, so that is consistent with the diagram.

$svn mergeinfo ^/branches/1.0-stable
    youngest common ancestor
    |         last full merge
    |         |        tip of branch
    |         |        |         repository path

    11307     11800    14568   
    |         |        |       
       --| |------------         branches/1.0-stable
      /        \               
     /          \              
  -------| |------------         trunk
                       |       
                       WC      

However, the display of r11800 as the last full merge is confusing. Perhaps r11800 was the last automatic ("full" / non-cherrypick) merge? However svn:mergeinfo for r11800 looks like a cherry-pick merge. Maybe mergeinfo is confused by our cherry-pick merge pattern?

Here is the diagram for ^/branches/1.0-stable relative to ^/branches/0.12-stable:

$svn mergeinfo ^/branches/0.12-stable
    youngest common ancestor
    |         last full merge
    |         |        tip of branch
    |         |        |         repository path

    9937      14309    14568   
    |         |        |       
       --| |------------         branches/0.12-stable
  ... /        \               
      \         \              
       --| |------------         branches/1.0-stable
                       |       
                       WC      

This diagram makes sense because r14310 was the last cherry-pick merge from 0.12-stable to 1.0-stable (see log:branches/0.12-stable@14568). 0.12-stable was created in r9938.

[Ryan J Ollos]

Replying to Ryan J Ollos:

It would also be good to document the process for committing work from a Git repository to SVN (comment:11:ticket:11189).

Documented in TracDev/DevelopmentWorkflow@8.

[Ryan J Ollos]

DONE Add some commit log message guidelines to TracDev/DevelopmentWorkflow, as described in ​gmessage:trac-dev:HbNnqWdibKM/v_yJ4_eOFwAJ.

[Ryan J Ollos]

Replying to Ryan J Ollos:

I'm considering modifying TracDev/DevelopmentWorkflow#Integrationinreleasebranches.

Done in TracDev/DevelopmentWorkflow@10 and TracDev/DevelopmentWorkflow@11.

[Ryan J Ollos]

I'lll create the release on Sunday, 2016-05-01.