[Harmony Wiki] Update of "BranchMerge" by MarkHindess

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

Dear Wiki user,

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

The "BranchMerge" page has been changed by MarkHindess.
The comment on this change is: Updaing to use svn-master for problematic steps..
http://wiki.apache.org/harmony/BranchMerge?action=diff&rev1=4&rev2=5

--------------------------------------------------

  svn commit -m "Merge updates from classlib trunk@767262 since r765922"
  }}}
  
- Finally, update the tag to show the last successful merge point:
+ Finally, using svn-master to avoid errors, update the tag to show the last successful merge point:
  
  {{{
- svn rm https://svn.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-java6-merge -m "Remove the old tag based on r765922"
+ svn rm https://svn-master.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-java6-merge -m "Remove the old tag based on r765922"
  
- svn copy -r 767262 https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk  https://svn.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-java6-merge -m "Create tag based on trunk@r767262 to mark the latest merge revision from trunk to java6 branch"
+ svn copy -r 767262 https://svn-master.apache.org/repos/asf/harmony/enhanced/classlib/trunk  https://svn-master.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-java6-merge -m "Create tag based on trunk@r767262 to mark the latest merge revision from trunk to java6 branch"
  }}}
  
- If during these last steps you get an error saying:
- 
- {{{
- svn: The specified baseline is not the latest baseline, so it may not be checked out.
- }}}
- 
- then this is probably a syncing problem with the svn.apache.org mirrors so try using the master server (currently eris.apache.org) rather than svn.apache.org.
-