Merge from default¶
Development of new features always start in the
default branch. When a feature is closed, a MFD date is associated with a redmine issue. When this date expires, the revision must be merge into the current
Go to the issues page and do the following:
- Expand the filter options
- Move MFD after and MFD revision columns to the right
- Select MFD revision in the group by combobox
Update to current stable the branch, example:
$ hg up stable-2
Merge the highest revision number from the list if the date expired.
$ hg merge -r 425
Commit a message with all associated revisions in the following form:
$ hg ci -m "misc: MFD for #123, #124, #125" $ hg push
Then change the Resolved status to Closed.