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 Mon, 03 Jul 2006 19:26:42 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:
Updates following 10.1.3 experiences

------------------------------------------------------------------------------
  This page provides some tips for the developer who is moving a change from one branch to
another.
  
  For general information on using Subversion on Apache projects, see http://www.apache.org/dev/version-control.html
+ 
+ == Prior to Commit ==
+ 
+ These steps can be performed by any Derby contributor to establish the readiness of a change
for merging to another branch. If the change merges successfully and you can run tests, etc.,
please comment on the JIRA that a simple svn merge works. This helps the committer looking
to perform the actual merge, since they know the merge works and tests have already been run,
etc.
+ 
+ If there are conflicts in the merge, please resolve the conflicts in your subversion view,
run tests, and post a patch for a committer to review. The committer can then pick up the
patch, review the differences between the original and merged versions, and commit if all
is well.
+ 
+ Here are the steps:
  
   * First, check out the branch in question
   * Next, determine which revision(s) you wish to move. This information should be available
in the JIRA notes for the issue that you're working on. The main Comments section is below
the Description box. To the right of "Comments" there is a "Subversion Commits" link, which
brings up the svn info.
   * For purposes of this page, we'll use the example of DERBY-1207, where the changes to
the trunk were made as revision 393540, and we wish to merge those changes to branch 10.1:
     * {{{cd derby/doc/branches/10.1}}}
     * {{{svn merge -r 393539:393540 https://svn.apache.org/repos/asf/db/derby/docs/trunk/}}}
-    * review the results that you got, build and test, and then commit.
+    * review the results that you got, build them, and run the necessary tests.
   * Note that you can also merge a range of fixes. Depending on what you are doing, you may
have one or several revisions to merge.
-  * When committing the 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:
-    * DERBY-324  AES encryption test fails on Solaris 10
-    * Merged by svn merge -r 232996:232997 ../trunk/ 
-    * Originally submitted by Olav Sandstaa
  
+ == 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:
+  * DERBY-324  AES encryption test fails on Solaris 10
+  * Merged by svn merge -r 232996:232997 ../trunk/ 
+  * 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
+ 
+  * 10.1.3.0 - So that it will be in the bug fix release release notes.
+  * 10.1.2.x - As shown by sysinfo on the 10.1 branch
+  * 10.2.0.x - As shown by sysinfo on the trunk
+ 

Mime
View raw message