Page History

...

This document is different to the the SVN Tips\ in that it does not use the "svn_load_dirs" script but it relies on two very good tools Tortoise SVN and WinMerge. Some might say that unfortunately these tools are somewhat tainted by their platform requirements but I could not get the "svn_load_dirs" script to work for me (I tried and tried on several platforms) so I picked two tools that I can rely on and would recommend to any MS platform user.

...

Create a new SVN repository....

• Initialization of an empty repository

  Code Block
  svnadmin create ./svn-repos

• Edit the ./svn-repos/conf/svnserve.conf file
• Edit the ./svn-repos/conf/passwd file

• Start the service

  Code Block
  svnserve --daemon --root ./svn-repos

...

Using explorer right mouse and SVN Checkout and enter:
  https   http://svn.apache.org/repos/asf/incubatorofbiz/ofbiz-framework/trunk - as URL of the repository

...

Export the current live OFBiz as per stage 3 above, updating the revision number as appropriate, so in this example I end up with ofbiz_apache_r483333_export\ofbiz_apache_current.

3. OFBiz Merge

Wiki MarkupNow I'm going to merge the exported folder into *ofbiz_local_current* using WinMerge. I tend to merge left to right so do:  
  Left: ofbiz_apache_r483333_export\ofbiz_apache_current\  
  Right: ofbiz_local_current\  
  Filter: \ [F\] Java CVS/SVN loose  _loose  (just want it to skip the .svn folders)_

How to merge:  (helps to hide skipped and identical files)
1) Sort by Comparison results
2) Transfer all files listed as "Files are different" and "Binary files are different", left to right.
3) Now sort by Filename and you should have all the folders at the top and you can see what might have been added, moved or deleted:
  Added: This is a simple copy left to right in WinMerge

...