21 |
file (you may change the comment style if needed): |
file (you may change the comment style if needed): |
22 |
|
|
23 |
/* FILENAME SHORT DESCRIPTION OF THE FILE |
/* FILENAME SHORT DESCRIPTION OF THE FILE |
24 |
p |
|
25 |
Copyright (C) 1999 Beau Kuiper |
Copyright (C) 1999 Beau Kuiper |
26 |
|
|
27 |
This program is free software; you can redistribute it and/or modify |
This program is free software; you can redistribute it and/or modify |
87 |
MAIN |
MAIN |
88 |
This tree is under full control of Beau Kuiper. If you want to |
This tree is under full control of Beau Kuiper. If you want to |
89 |
change things here you have to get his OK first. That is to ensure |
change things here you have to get his OK first. That is to ensure |
90 |
the quality and security of muddleftpd because every code added here |
the quality and security of muddleftpd because all code added here |
91 |
has to be fully reviewed. This tree will ever built a running |
has to be fully reviewed. This tree will be branched to create new |
92 |
muddleftpd and everyone that commits here (after the OK) has to make |
releases and everyone that commits here (after the OK) has to make |
93 |
sure HE DOESNT BREAK IT. |
sure HE DOESNT BREAK IT. |
94 |
|
|
95 |
release_* |
release_* |
99 |
Such a branch is the place to fix bugs in a released version. See |
Such a branch is the place to fix bugs in a released version. See |
100 |
below for more about that. |
below for more about that. |
101 |
|
|
102 |
everything_you_can_imagine |
dev_NICK_feature |
103 |
Every developer is allowed to create a branch with every name he |
Every developer is allowed to create a branch within the |
104 |
wants. (It should not include bad words :) ). He is then fully |
repository. Just replace NICK with the nick you have on Savannah and |
105 |
responsible for that branch, so if you want to work on anothers |
feature with the feature you want to develop in that branch. That |
106 |
developers branch talk to him first. |
way everyone knows whats going on with a particular branch. |
107 |
|
He is then fully responsible for that branch, so if you want to work |
108 |
|
on anothers developers branch talk to him first. |
109 |
Developers can use that to work on new features/enhancements without |
Developers can use that to work on new features/enhancements without |
110 |
breaking the MAIN tree of muddleftpd and without the rules that are |
breaking the MAIN tree of muddleftpd and without the rules that are |
111 |
for that tree. |
for that tree. |
119 |
merged into MAIN. Then you only commit things into that branch that |
merged into MAIN. Then you only commit things into that branch that |
120 |
are needed to get it accepted into MAIN, and after all things are |
are needed to get it accepted into MAIN, and after all things are |
121 |
sorted out you and Beau merge it into MAIN. Voila, a new feature is |
sorted out you and Beau merge it into MAIN. Voila, a new feature is |
122 |
there without one break of our MAIN line. :) |
there without breaking of our MAIN line. :) |
123 |
|
|
124 |
If you ever create a branch and find out later that you dont need it, |
If you ever create a branch and find out later that you dont need it, |
125 |
you can remove that branch from the repository. The project admins are |
you can remove that branch from the repository. The project admins are |
142 |
Development |
Development |
143 |
Development of Muddleftpd is ongoing. The work is done in MAIN |
Development of Muddleftpd is ongoing. The work is done in MAIN |
144 |
(see above) and in developer-created branches. You can add as |
(see above) and in developer-created branches. You can add as |
145 |
many new features you want (see notes for MAIN above). |
many new features as you want (see notes for MAIN above). |
146 |
|
|
147 |
Frozen |
Frozen |
148 |
From time to time Joerg will create a new Branch in the CVS |
From time to time Joerg will create a new Branch in the CVS |
196 |
on Savannah, and also announce it on the mailing list (do not send the |
on Savannah, and also announce it on the mailing list (do not send the |
197 |
patch to the list, just send a short announcement). You must NOT submit |
patch to the list, just send a short announcement). You must NOT submit |
198 |
the entire changed file, nor just the changed lines of code. If you |
the entire changed file, nor just the changed lines of code. If you |
199 |
submit something other than a patch, you will be asked politely to |
submit something other than a patch created using the instructions |
200 |
resubmit your changes as a patch, and your code will not be merged until |
below, you will be asked politely to resubmit your changes as a patch. |
201 |
you do. |
Your code will not be merged until you do. |
202 |
|
|
203 |
Note: If your patch is around twice the size of the file you're |
Note: If your patch is around twice the size of the file you're |
204 |
patching, something went wrong. DO NOT submit that patch. If you edited |
patching, something went wrong. DO NOT submit that patch. If you edited |
206 |
run diff on it, you need to make sure the end-of-line characters are the |
run diff on it, you need to make sure the end-of-line characters are the |
207 |
unix kind. Ask on the mailing list if you have this problem. |
unix kind. Ask on the mailing list if you have this problem. |
208 |
|
|
209 |
|
Example: |
210 |
|
To create a unified patch suitable for submission, have both your modified |
211 |
|
source tree and the original source tree avaliable. Prepare both trees for |
212 |
|
comparison by running the following (on both trees): |
213 |
|
|
214 |
|
bash$ ./configure |
215 |
|
bash$ make maintainer-clean |
216 |
|
|
217 |
|
Now compare the two trees using the following command: |
218 |
|
|
219 |
|
bash$ diff -r -u3 [path to original tree] [path to modified tree] > patchfile |
220 |
|
|
221 |
|
Patchfile will now contain your patch and you can submit it. Be sure that |
222 |
|
you don't mix the original and modified tree paths up, otherwise your patch |
223 |
|
will end up backwards. |
224 |
|
|
225 |
|
Note: if you need to use your tree again after creating the patch, simply run |
226 |
|
./autogen.sh in the source tree. This will automaticly regenerate all the |
227 |
|
configure scripts. |
228 |
|
|
229 |
|
|
230 |
1.6 How to become a developer |
1.6 How to become a developer |
231 |
|
|