harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Harmony Wiki] Update of "BranchMerge" by MarkHindess
Date Tue, 30 Mar 2010 21:02:22 GMT
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: Updating urls to reflect new harmony/enhanced/java tree..
http://wiki.apache.org/harmony/BranchMerge?action=diff&rev1=8&rev2=9

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

  You'll need to check out a working copy of the Java 6 stream.  Let's assume that you have
the Java 6 stream is checked out as "Harmony-java6", i.e.
  
  {{{
- svn co https://svn.apache.org/repos/asf/harmony/enhanced/branches/java6 Harmony-java6
+ svn co https://svn.apache.org/repos/asf/harmony/enhanced/java/branches/java6 Harmony-java6
  }}}
  
  To perform a merge, ensure the working copy is up to date:
@@ -18, +18 @@

  Perform the actual merge:
  
  {{{
- svn merge https://svn.apache.org/repos/asf/harmony/enhanced/trunk
+ svn merge https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk
  }}}
  
  A useful tip is to do a merge with {{{ --dry-run }}} first to see what will happen!  You
may also append a revision number such as '@926505' to the repository url to merge up to a
specific revision number.

Mime
View raw message