Version Control with Subversion - Login

Customizing Your Subversion ExperienceSHIFTSHIFTSET MINE=%7SET OLDER=%8SET YOURS=%9REM Call the merge command (change the following line to make sense forREM your merge program).%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%REM After performing the merge, this script needs to print the contentsREM of the merged file to stdout. Do that in whatever way you see fit.REM Return an errorcode of 0 on successful merge, 1 if unresolved conflictsREM remain in the result. Any other errorcode will be treated as fatal.SummarySometimes there's a single right way to do things; sometimes there are many. Subversion'sdevelopers understand that while the majority of its exact behaviors are acceptableto most of its users, there are some corners of its functionality where such a universallypleasing approach doesn't exist. In those places, Subversion offers users the opportunity totell it how they want it to behave.In this chapter, we explored Subversion's runtime configuration system and other mechanismsby which users can control those configurable behaviors. If you are a developer,though, the next chapter will take you one step further. It describes how you can furthercustomize your Subversion experience by writing your own software against Subversion'slibraries.205