[Db-derby Wiki] Update of "MoveAChangeBetweenBranches" by KatheyMarsden

[Apache Wiki <wi...@apache.org>]

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 KatheyMarsden:
http://wiki.apache.org/db-derby/MoveAChangeBetweenBranches

------------------------------------------------------------------------------
     * review the results that you got, build them, and run the necessary tests.
     * In some cases, it is possible that a merge has conflicts in some files. In that case, please resolve the changes in the files that have the conflict and then generate a patch. When merging and creating a new patch for a branch, if you see a "A  + " in svn status, this indicates only property change for new files. The contents of the new files are not added to the patch file. One way to include the new files is, to do a "svn revert" and "svn add" for the "A  + " files. 
   * 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.
+ 
+ Code Example
+ 
+ The example above was a documentation change. Below is an example of the commands for a code change, the merge of DERBY-4268 (revision 78527) from trunk to 10.5. Notice the URL is different.
+ 
+    * {{{ cd derby/10.5 }}} (the source root for your 10.5 checkout)
+    * {{{svn merge -r 785270:785271 https://svn.apache.org/repos/asf/db/derby/code/trunk }}}
+    * build and run tests.
  
  == During the Commit ==