Changes between Initial Version and Version 1 of Ticket #12358, comment 2
- Timestamp:
- Feb 23, 2016, 12:42:23 AM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #12358, comment 2
initial v1 1 1 Replying to [comment:1 Ryan J Ollos]: 2 > TODO: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 .`2 > 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 .` 3 3 4 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?
