projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c66eff
)
Add some branch notes to DEVELOP.md
author
Carl Hetherington
<cth@carlh.net>
Fri, 13 Jan 2023 21:53:52 +0000
(22:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 13 Jan 2023 23:42:39 +0000
(
00:42
+0100)
DEVELOP.md
patch
|
blob
|
history
diff --git
a/DEVELOP.md
b/DEVELOP.md
index c89fe160147994aa1d525ce06da05e9a86169bb3..78231b89e72a5b9fd91688477baab88a2906e498 100644
(file)
--- a/
DEVELOP.md
+++ b/
DEVELOP.md
@@
-4,6
+4,19
@@
This file collects a few notes relevant to DCP-o-matic developers. There is als
[on the web site](https://dcpomatic.com/development).
[on the web site](https://dcpomatic.com/development).
+## 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
## Player stress testing
If you configure DCP-o-matic with `--enable-player-stress-test` you can make a script which