Edgewall Software

Changes between Version 1 and Version 2 of Ticket #12358, comment 2


Ignore:
Timestamp:
Feb 23, 2016, 1:02:02 AM (4 years ago)
Author:
Ryan J Ollos

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #12358, comment 2

    v1 v2  
    22> 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 .`
    33
    4 It seems that the `mergeinfo` command doesn't show cherry-pick merges? Perhaps r11800 was the last automatic ("full") merge? Though `svn:mergeinfo` for r11800 looks like a cherry-pick merge. Maybe `mergeinfo` is confused by our cherry-pick merge pattern?
    5 
    6 `/branches/1.0-stable` was created in r11308, so that is consistent with the diagram.
     4Below 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.
    75
    86{{{#!sh
     
    2321}}}
    2422
    25 Here's the `mergeinfo` output for 1.0-stable relative to 0.12-stable:
     23However, 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?
     24
     25Here is the diagram for `^/branches/1.0-stable` relative to `^/branches/0.12-stable`:
    2626{{{#!sh
    2727$svn mergeinfo ^/branches/0.12-stable
     
    4141}}}
    4242
    43 This diagram makes sense because r14310 was the last merge from 0.12-stable to 1.0-stable (see log:branches/0.12-stable@14568). `0.12-stable` was created in r9938.
     43This 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.