X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=DEVELOP.md;h=024e9d1aa7ff13894d6885261dafefe7886bc734;hb=2279660c63e8ebecfb352e3fc354e8cb5f2d58e6;hp=c89fe160147994aa1d525ce06da05e9a86169bb3;hpb=de9a71985d7e58d4c24305b68ff37c6229ef89e9;p=dcpomatic.git

diff --git a/DEVELOP.md b/DEVELOP.md
index c89fe1601..024e9d1aa 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -4,6 +4,39 @@ This file collects a few notes relevant to DCP-o-matic developers.  There is als
 [on the web site](https://dcpomatic.com/development).
 
 
+## Disk writer logging
+
+As we have no `film' folder to log to during disk writes, the logs end up:
+
+### macOS
+
+* Disk writer backend: `/var/log/dcpomatic_disk_writer_{out,err}.log`
+* Disk writer frontend: `/Users/$USER/Library/Preferences/2/com.dcpomatic/2.16/disk.log`
+
+### Windows
+
+* Disk writer backend: `c:\Users\$USER\AppData\Local\dcpomatic\2.16.0\disk_writer.log`
+* Disk writer frontend: `c:\Users\$USER\AppData\Local\dcpomatic\2.16.0\disk.log`
+
+### Linux
+
+* Disk writer backend: `/home/$USER/.config/dcpomatic/2.16.0/disk_writer.log`
+* Disk writer frontend: `/home/$USER/.config/dcpomatic/2.16.0/disk.log`
+
+
+## Branches
+
+The main dcpomatic repo has the following branches:
+
+* `main` - the main development branch; contains 2.16.x versions
+* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main`
+
+The `test/data` submodule has the following branches:
+
+* `v2.16.x` - branch for use with v2.16.x versions
+* `v2.18.x` - branch for use with v2.17.x versions (as will become v2.18.x)
+
+
 ## Player stress testing
 
 If you configure DCP-o-matic with `--enable-player-stress-test` you can make a script which