/[muddleftpd]/muddleftpd/Developer.txt
ViewVC logotype

Diff of /muddleftpd/Developer.txt

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by ganneff, Sun Oct 20 15:03:04 2002 UTC revision 1.4 by ganneff, Mon Nov 3 13:35:00 2003 UTC
# Line 7  read and some talks I had with other peo Line 7  read and some talks I had with other peo
7    
8  Contents  Contents
9    
10  1.0 Copyright issues  1.0    Copyright issues
11  1.1 Preface  1.1    Preface
12  1.2 CVS Branches  1.2    CVS Branches
13  1.3 Muddleftpd Releases  1.2.1  Branch management / Merging
14  1.4 Security Updates, Important Bugfixes  1.3    Muddleftpd Releases
15  1.5 ChangeLog Entries and CVS commit messages (log messages)  1.4    Security Updates, Important Bugfixes
16  1.6 Code Submission if you are not a developer of Muddleftpd  1.5    ChangeLog Entries and CVS commit messages (log messages)
17  1.7 How to become a developer  1.6    Code Submission if you are not a developer of Muddleftpd
18    1.7    How to become a developer
19    
20    
21  1.0 Copyright issues  1.0 Copyright issues
# Line 133  if it is not used at the moment or looks Line 134  if it is not used at the moment or looks
134  may contain important source changes/ ways to solve a problem we can  may contain important source changes/ ways to solve a problem we can
135  use at a later time.  use at a later time.
136    
137    1.2.1 Branch management / Merging
138    
139    Ok, sometimes you may want to create a branch or merge a branch with
140    MAIN (after Beau said yes to the changes). Some small hints for that are
141    listed below.
142    First to create the branch you want to work in. Its done with
143    
144    cvs tag -b dev-developername-feature
145    
146    That creates the branch, see above in 1.2 for the naming convention.
147    After that you NEED to do a
148    
149    cvs update -r dev-developername-feature
150    
151    to get your local copy to recognize the branch. If not you would still
152    work in MAIN and thats not what you want.
153    
154    Now, for the merge. Its simple. You need a checkout of the latest
155    Version of the MAIN revisions. In that directory you execute
156    
157    cvs update -j dev-developername-feature
158    
159    to merge your changes with MAIN. That tries to merge all your changes,
160    but maybe there is a conflict. You then need to resolv that conflict
161    before you commit the changes, of course. After you resolved all
162    conflicts its a simple
163    
164    cvs commit
165    
166    in the tree to commit your changes.
167    You should now do a
168    
169    cvs tag dev-developername-feature-merge-with-main
170    
171    to tag your branch at the time you merged. That way you can still work
172    on your branch and later merge it again, with only the changes you
173    added after the first merge. For that you modify the command above to
174    read as
175    
176    cvs update -j dev-developername-feature-merge-with-main -j dev-developername-feature
177    
178    and cvs only considers the newly added code after the first merge. If
179    you dont tag the branch cvs considers all changes, including the
180    already merged ones - that gives a lot of conflicts to resolve.
181    
182    
183  1.3 Muddleftpd Releases  1.3 Muddleftpd Releases

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26