Edgewall Software
Modify

Opened 4 years ago

Closed 4 years ago

Last modified 2 years ago

#12358 closed task (fixed)

Release Trac 1.0.11

Reported by: Ryan J Ollos Owned by: Ryan J Ollos
Priority: normal Milestone: 1.0.11
Component: general Version:
Severity: normal Keywords: release
Cc: Branch:
Release Notes:

Released Trac 1.0.11.

API Changes:

Description

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

Attachments (0)

Change History (8)

comment:1 by Ryan J Ollos, 4 years ago

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.

Last edited 2 years ago by Ryan J Ollos (previous) (diff)

in reply to:  1 comment:2 by Ryan J Ollos, 4 years ago

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.

Last edited 4 years ago by Ryan J Ollos (previous) (diff)

in reply to:  1 comment:3 by Ryan J Ollos, 4 years ago

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.

comment:4 by Ryan J Ollos, 4 years ago

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

Version 0, edited 4 years ago by Ryan J Ollos (next)

in reply to:  1 comment:5 by Ryan J Ollos, 4 years ago

Last edited 4 years ago by Ryan J Ollos (previous) (diff)

comment:6 by Ryan J Ollos, 4 years ago

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

comment:7 by Ryan J Ollos, 4 years ago

Owner: set to Ryan J Ollos
Status: newassigned

comment:8 by Ryan J Ollos, 4 years ago

Release Notes: modified (diff)
Resolution: fixed
Status: assignedclosed

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Ryan J Ollos.
The resolution will be deleted. Next status will be 'reopened'.
to as closed The owner will be changed from Ryan J Ollos to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.