[Myfaces Wiki] Trivial Update of "TrinidadCreating12Branches" by AdamWiner

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

Dear Wiki user,

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

The following page has been changed by AdamWiner:
http://wiki.apache.org/myfaces/TrinidadCreating12Branches

The comment on the change is:
Formatting updates

------------------------------------------------------------------------------
  
  1A. Create new branch from trunk,  *using revision used to corresponding 1.0.x branch* 
  
- svn cp -r579900 https://svn.apache.org/repos/asf/myfaces/trinidad/trunk/trinidad https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch
+ {{{svn cp -r579900 https://svn.apache.org/repos/asf/myfaces/trinidad/trunk/trinidad
+                 https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch}}}
  
  OR, probably better
  
  1B. Create new branch from the start of the 1.0.x branch, with a revision *before* [maven-release-plugin]
  
- svn cp -r579893 https://svn.apache.org/repos/asf/myfaces/trinidad/branches/matzew-core-103-release-reloaded/trinidad https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch -m"Creating new 1.2 branch"
+ {{{svn cp -r579893
+        https://svn.apache.org/repos/asf/myfaces/trinidad/branches/matzew-core-103-release-reloaded/trinidad
+        https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch -m"Creating new 1.2 branch"}}}
  
  
  == 2. CHECK OUT THE BRANCH ==
  
  Check out the newly created branch:
  
- svn co https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch trinidad-1.2.3
+ {{{svn co https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.3-branch trinidad-1.2.3}}}
  
  == 3. MERGE IN THE OLD 1.2 CODE ==
  
  From the new Trinidad directory, merge in the code from the *prior* 1.2.2 branch.   
  
- cd trinidad-1.2.3
+ {{{cd trinidad-1.2.3
+ ## Note the revision number used to create that 1.2.2 branch, and use it in the next step!
  svn log https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.2-branch --stop-on-copy
+ svn merge -r563667:HEAD
- 
- (Note the revision number used to create that 1.2.2 branch, and use it in the next step!)
- 
- svn merge -r563667:HEAD https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.2-branch/trinidad
+           https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.2-branch/trinidad}}}
  
  == 4. FIX CONFLICTS ==
  
@@ -43, +45 @@

  
  The hard conflicts are in code.  Often, these will be simple little tweaks, but occasionally there are massive differences.  Usually, these imply one of two things:
  
- - The files have significantly diverged in the 1.1 and 1.2 codebases, so a fix cannot be easily applied
+  * The files have significantly diverged in the 1.1 and 1.2 codebases, so a fix cannot be easily applied
- - The same fix was applied on both the 1.1 and 1.2 branches (and somewhat differently on each)
+  * The same fix was applied on both the 1.1 and 1.2 branches (and somewhat differently on each)
  
  In either case, what you should do is:
  
- - Use the code from the prior 1.2 branch wholesale.
+  * Use the code from the prior 1.2 branch wholesale.
- - Check the log on the trunk to see exactly what changes were made in between the previous release and this one, and re-apply all of those fixes by hand.
+  * Check the log on the trunk to see exactly what changes were made in between the previous release and this one, and re-apply all of those fixes by hand.
  
  == 5. VERIFY THE CODE BUILDS ==
  
- mvn install, etc.
+ {{{mvn install}}}, etc.
  
  == 6. CHECK IN THE BRANCH ==
  
- svn commit -m"Merged 1.2 code"
+ {{{svn commit -m"Merged 1.2 code"}}}
  
  == 7. TEST ==