Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Eclipse

...

  • Make sure that rmiregistry is not running on your RMIDispatcher/JOTM/jndi port before starting Open for Business

Anchor
SourceDifferences
SourceDifferences

How to manage your source differences

The first three links use the vendor branch principle

  1. An old how to for CVS, may be adapted to SVN
  2. A more recent one for SVN
  3. A specific one for Windows

A discussion about this topic on user ML proposing an alternative simpler way, extract :

  1. I keep two main patch files - basic_development.patch and basic_production.patch. Both patch files change the OFBiz configuration to work with our network environment, each one using settings chosen for the task - development or production. Only one patch is used at a time.
  2. I keep all of my custom development in a single folder under the ofbiz/applications folder. I avoid touching the trunk code at all costs - except for the configuration patches mentioned above.
  3. To keep my local copy updated, I do an SVN revert (to reverse the changes made by the patch), then an SVN update, then re-apply the patch. My custom development folder is untouched by the SVN commands, because SVN doesn't "know" about the folder.

This works really well and it doesn't involve any complicated merging - since the configuration files changed by the patches seldom change in the trunk.