Changes between Version 12 and Version 13 of TracDev/DevelopmentWorkflow

Timestamp:

Mar 7, 2016, 7:04:06 PM (8 years ago)

Author:

Ryan J Ollos

Comment:

Add link to svn book.

TracDev/DevelopmentWorkflow

@@ -63 +63 @@
  - Use newer APIs and conventions, eg the DatabaseApi#Trac1.0API; see the ApiChanges subpage for the corresponding target branch.
 
-If a changeset should not be forward ported, for example when extracting new messages to the catalog, the commit should be blocked using a //record only// merge. The //record only// merge is the same as a cherry-pick merge, with the addition of the `--record-only` switch.
+If a changeset should not be forward ported, for example when extracting new messages to the catalog, the commit should be blocked using a [http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.blockchanges record only] merge. The //record only// merge is the same as a cherry-pick merge, with the addition of the `--record-only` switch.
 
 '''Note''': you can always review the pending changes by viewing the `svn:mergeinfo` property in the TracBrowser, eg [source:trunk], which shows the changesets that are **eligible** for merge to the target branch.