db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Db-derby Wiki] Update of "MoveAChangeBetweenBranches" by BryanPendleton
Date Sat, 22 Dec 2007 03:31:39 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Db-derby Wiki" for change notification.

The following page has been changed by BryanPendleton:
http://wiki.apache.org/db-derby/MoveAChangeBetweenBranches

The comment on the change is:
Include a few suggestions from Andrew and Dan

------------------------------------------------------------------------------
  
  == During the Commit ==
  
- When committing a merged change, it would be good if commit comments included the issue
summary. This helps people who are studying the code later to avoid having to visit Jira each
time. For example:
+ When committing a merged change, it would be good if commit comments included the issue
summary, and a brief overview of the change. This helps people who are studying the code later
to avoid having to visit Jira each time. 
+ This helps when looking for changes that might have broken a test, a useful commit message
can help in determining if change is likely to have broken a specific area or not.
+ 
+ Also, it is a good idea to include the specific revisions that you merged, and whether or
not additional changes were necessary. This helps others when porting to another branch further
back and helps to prevents duplicate merges by keeping a list of merged revisions in the history
that a person can check against.
+ 
+ For example:
   * DERBY-324  AES encryption test fails on Solaris 10
   * Merged by svn merge -r 232996:232997 ../trunk/ 
+  * Simple merge with no conflicts; no additional changes were necessary.
   * Originally submitted by Olav Sandstaa
  
  Mark the issue resolved only after the fix is in both the trunk and the branch. The fixin
fields should be marked as

Mime
View raw message