You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: doc/developer-notes.md
+18-14Lines changed: 18 additions & 14 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1132,37 +1132,41 @@ Subtrees
1132
1132
1133
1133
Several parts of the repository are subtrees of software maintained elsewhere.
1134
1134
1135
-
Some of these are maintained by active developers of Bitcoin Core, in which case changes should probably go
1136
-
directly upstream without being PRed directly against the project. They will be merged back in the next
1137
-
subtree merge.
1135
+
Some of these are maintained by active developers of Dash Core, in which case
1136
+
changes should go directly upstream without being PRed directly against the project.
1137
+
They will be merged back in the next subtree merge.
1138
1138
1139
-
Others are external projects without a tight relationship with our project. Changes to these should also
1140
-
be sent upstream, but bugfixes may also be prudent to PR against Dash Core so that they can be integrated
1141
-
quickly. Cosmetic changes should be purely taken upstream.
1139
+
Others are external projects without a tight relationship with our project. Changes
1140
+
to these should also be sent upstream, but bugfixes may also be prudent to PR against
1141
+
a Dash Core subtree, so that they can be integrated quickly. Cosmetic changes
1142
+
should be taken upstream.
1142
1143
1143
-
There is a tool in `test/lint/git-subtree-check.sh` ([instructions](../test/lint#git-subtree-checksh)) to check a subtree directory for consistency with
1144
-
its upstream repository.
1144
+
There is a tool in `test/lint/git-subtree-check.sh` ([instructions](../test/lint#git-subtree-checksh))
1145
+
to check a subtree directory for consistency with its upstream repository.
1145
1146
1146
1147
Current subtrees include:
1147
1148
1148
1149
- src/leveldb
1149
-
- Upstream at https://github.com/google/leveldb ; Maintained by Google, but
1150
-
open important PRs to Core to avoid delay.
1150
+
- Subtree at https://github.com/bitcoin-core/leveldb-subtree ; maintained by Core contributors.
1151
+
- Upstream at https://github.com/google/leveldb ; maintained by Google. Open
1152
+
important PRs to the subtree to avoid delay.
1151
1153
-**Note**: Follow the instructions in [Upgrading LevelDB](#upgrading-leveldb) when
1152
1154
merging upstream changes to the LevelDB subtree.
1153
1155
1154
1156
- src/crc32c
1155
1157
- Used by leveldb for hardware acceleration of CRC32C checksums for data integrity.
1156
-
- Upstream at https://github.com/google/crc32c ; Maintained by Google.
1158
+
- Subtree at https://github.com/bitcoin-core/crc32c-subtree ; maintained by Core contributors.
1159
+
- Upstream at https://github.com/google/crc32c ; maintained by Google.
1157
1160
1158
1161
- src/secp256k1
1159
-
- Upstream at https://github.com/bitcoin-core/secp256k1/ ; actively maintained by Core contributors.
1162
+
- Upstream at https://github.com/bitcoin-core/secp256k1/ ; maintained by Core contributors.
1160
1163
1161
1164
- src/crypto/ctaes
1162
-
- Upstream at https://github.com/bitcoin-core/ctaes ; actively maintained by Core contributors.
1165
+
- Upstream at https://github.com/bitcoin-core/ctaes ; maintained by Core contributors.
1163
1166
1164
1167
- src/univalue
1165
-
- Upstream at https://github.com/bitcoin-core/univalue ; actively maintained by Core contributors, deviates from upstream https://github.com/jgarzik/univalue
1168
+
- Subtree at https://github.com/bitcoin-core/univalue-subtree ; maintained by Core contributors.
1169
+
- Deviates from upstream https://github.com/jgarzik/univalue.
1166
1170
1167
1171
- src/minisketch
1168
1172
- Upstream at https://github.com/sipa/minisketch ; maintained by Core contributors.
0 commit comments