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 Thu, 13 Apr 2006 18:17:37 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:

New page:
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

 * 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.
 * 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.

View raw message