Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-03 20:27:08 -0700 (Fri, 03 Aug 2007)
Revision: 11583
Log message:

      - The changes in omake:branch-baserev are themselves a source of potential
       conflict, we need to be careful not to create one.
     - When nothing was changed, do not commit the dummy change in the
       omake:branch-baserev property.
     - The redo-branch script was only needed to redo the branches, deleting it
       now.