Page History

...

• Every month we get a new OFBiz revision (in this example, we get revision 5100)

  Code Block
  svn export http://svn.ofbiz.org/svn/ofbiz/trunk ./tmpdir/ofbiz-5100

• And we update our current version of the "ofbiz" project in our svn repository and we automatically create also a tag (5100, see the -t argument)

  Code Block
  ./svn_load_dirs.pl -t ofbiz-5100 svn://localhost/ofbiz current ./tmpdir/ofbiz-5100

  question: are the svn properties that need to be applied to new files correctly retrieved from the .svnversion/conf file?
  answer: probably not; you have to setup a config file (as described at the bottom of this page) and pass it to the svn_load_dirs.pl script with the -p argument.
• We have to synch customofbiz, that was based on the ofbiz-5000 tag, with the ofbiz tag ofbiz-5100; we do this in our working copy, not in the repository (before doing this, make sure that your working directory has no local changes and it is updated).

  Code Block
  svn merge svn://localhost/ofbiz/ofbiz-5000 svn://localhost/ofbiz/ofbiz-5100 ./tmpdir/customofbiz

• Fix in your local copy all the conflicts, test and then commit your changes.
• It is also a good idea to tag the new customofbiz revision.

  Code Block
  svn copy -m "OfbizCustom is initially built over the OFBiz 5000 tag" svn://localhost/customofbiz/trunk svn://localhost/customofbiz/customofbiz-5100

• Continuing with the example, let's say that one month later, I export a new OFBiz release (5200) and import it with (svn_load_dir.pl) in the ofbiz/current and as a new tag ofbiz-5200; I'll use the following command to perform the merge (thanks to Kenneth Porter for the tip):

  Code Block
  svn merge svn://localhost/ofbiz/ofbiz-5100 svn://localhost/ofbiz/ofbiz-5200 ./tmpdir/customofbiz

...