| ... |
... |
@@ -5,8 +5,8 @@ project's archives. It is highly optimized for the Debian project, |
|
5
|
5
|
though can be used by others too.
|
|
6
|
6
|
|
|
7
|
7
|
## More reading
|
|
8
|
|
-There are some manual pages and READMEs in the [doc](doc) sub-directory. The
|
|
9
|
|
-[TODO](doc/TODO) file is an incomplete list of things needing to be done.
|
|
|
8
|
+There are some manual pages and READMEs in the [docs](docs) sub-directory. The
|
|
|
9
|
+[TODO](docs/TODO) file is an incomplete list of things needing to be done.
|
|
10
|
10
|
|
|
11
|
11
|
There's a mailing list for discussion, development of and help with
|
|
12
|
12
|
dak. See:
|
| ... |
... |
@@ -15,7 +15,36 @@ dak. See: |
|
15
|
15
|
|
|
16
|
16
|
for archives and details on how to subscribe.
|
|
17
|
17
|
|
|
18
|
|
-# Setup
|
|
|
18
|
+# Contributing
|
|
|
19
|
+We love to get patches for dak. Enhancements, bugfixes,
|
|
|
20
|
+make-code-nicer/easier, anything.
|
|
|
21
|
+
|
|
|
22
|
+## Merge requests
|
|
|
23
|
+With dak being available at the [Salsa Service](https://salsa.debian.org), we
|
|
|
24
|
+now prefer receiving merge requests there. They allow simple reviews
|
|
|
25
|
+using the webinterface and also allow discussing (parts of) the code
|
|
|
26
|
+within the Salsa UI. They also allow much easier tracking the state of
|
|
|
27
|
+different requests than a mail on a list ever allows.
|
|
|
28
|
+
|
|
|
29
|
+To create merge requests that, simply go to [the Salsa project
|
|
|
30
|
+page](https://salsa.debian.org/ftp-team/dak), select **Fork** followed
|
|
|
31
|
+by the namespace you want to put it in (usually your private one).
|
|
|
32
|
+Then simply clone this fork and work it in, preferably in a branch
|
|
|
33
|
+named after whatever-you-are-doing.
|
|
|
34
|
+
|
|
|
35
|
+When you are happy with what you coded, use the UI on Salsa to create
|
|
|
36
|
+a merge request from your feature branch, either using the web
|
|
|
37
|
+interface or by using e-mail, see the [Gitlab MR
|
|
|
38
|
+documentation](https://docs.gitlab.com/ce/user/project/merge_requests/)
|
|
|
39
|
+for details on this process.
|
|
|
40
|
+
|
|
|
41
|
+
|
|
|
42
|
+### Alternative to using Salsa
|
|
|
43
|
+While we do prefer merge requests as described above, we also accept
|
|
|
44
|
+patches send by mail to our mailing list, see above for details on
|
|
|
45
|
+the list.
|
|
|
46
|
+
|
|
|
47
|
+# Setup dak
|
|
19
|
48
|
You can find more info about setting dak up inside the [setup](setup)
|
|
20
|
49
|
Folder and its [README](setup/README).
|
|
21
|
50
|
|