README

   1 BlackBox diffutils
   2 --------------------
   3
   4 Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
   5
   6
   7 Commands
   8 --------------------
   9
  10 To use tools within Blackbox just compile DevDiff.
  11
  12 DevDiff.Compare (guard TextCmds.FocusGuard)
  13
  14         Compare texts from two windows.
  15         Can directly replace DevSearch.Compare in Dev/Rsrc/Menus.odc.
  16
  17
  18 ^Q DevDiff.CompareThis <oldfile> <newfile> [">" <outfile>]
  19
  20         Compare two files and produce patch in unified diff format.
  21
  22
  23 ^Q DevDiff.ApplyPatch <patchfile>
  24
  25         Read unified diff format and apply changes from it.
  26
  27
  28 ^Q DevDiff.MergeThis <my> <old> <your> [">" <outfile>]
  29
  30         Read three files and do three-way merge like.
  31
  32
  33 Dedicated tool
  34 --------------------
  35
  36 You can read, create diffs and merge documents from command line using odctool.
  37 To build open OdctoolMain and execute commanders at the end of document.
  38 Call `odctoll.exe help` to learn how to use it.
  39
  40 Warning: It tested only with wine and NOT tested on windows or native linux.
  41
  42
  43 Integration with GIT
  44 --------------------
  45
  46 It is possible to integrate three-way merge with git.
  47
  48 1. Open .git/config and add this lines:
  49
  50         [merge "odctool"]
  51                 name = BlackBox Compound Document merge driver
  52                 driver = /full/path/to/odctool merge -P %P %A %O %B %A
  53
  54 2. Open/create .git/info/attributes and add this line:
  55
  56         *.odc merge=odctool
  57
  58 Now when conflict occurs, it marked like diff3 directly in odc file.
  59 Checked not only text, but also views and formatting.
  60
  61
  62 Current state
  63 --------------------
  64
  65 This is NOT final version of module DevDiff and Odctool. It is NOT well tested, you are warned!
  66 Also, program and user interfaces can be changed later.
  67 Todo list see at the and of sources and build tools.