[Muddleftpd-cvs] muddleftpd Developer.txt

[Joerg Jaspert]

CVSROOT:        /cvsroot/muddleftpd
Module name:    muddleftpd
Branch:         
Changes by:     Joerg Jaspert <address@hidden>  03/11/03 08:35:00

Modified files:
        .              : Developer.txt 

Log message:
        Hints about merging/branching

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/Developer.txt.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: muddleftpd/Developer.txt
diff -c muddleftpd/Developer.txt:1.3 muddleftpd/Developer.txt:1.4
*** muddleftpd/Developer.txt:1.3        Sun Oct 20 11:03:04 2002
--- muddleftpd/Developer.txt    Mon Nov  3 08:35:00 2003
***************
*** 1,20 ****
  Muddleftpd Developer Guidelines
  
! This is: $Revision: 1.3 $.
  
  [Note before: That text is assembled from different other guidelines I
  read and some talks I had with other people.]
  
  Contents
  
! 1.0 Copyright issues
! 1.1 Preface
! 1.2 CVS Branches
! 1.3 Muddleftpd Releases
! 1.4 Security Updates, Important Bugfixes
! 1.5 ChangeLog Entries and CVS commit messages (log messages)
! 1.6 Code Submission if you are not a developer of Muddleftpd
! 1.7 How to become a developer
  
  
  1.0 Copyright issues
--- 1,21 ----
  Muddleftpd Developer Guidelines
  
! This is: $Revision: 1.4 $.
  
  [Note before: That text is assembled from different other guidelines I
  read and some talks I had with other people.]
  
  Contents
  
! 1.0    Copyright issues
! 1.1    Preface
! 1.2    CVS Branches
! 1.2.1  Branch management / Merging
! 1.3    Muddleftpd Releases
! 1.4    Security Updates, Important Bugfixes
! 1.5    ChangeLog Entries and CVS commit messages (log messages)
! 1.6    Code Submission if you are not a developer of Muddleftpd
! 1.7    How to become a developer
  
  
  1.0 Copyright issues
***************
*** 133,138 ****
--- 134,183 ----
  may contain important source changes/ ways to solve a problem we can
  use at a later time.
  
+ 1.2.1 Branch management / Merging
+ 
+ Ok, sometimes you may want to create a branch or merge a branch with
+ MAIN (after Beau said yes to the changes). Some small hints for that are
+ listed below.
+ First to create the branch you want to work in. Its done with
+ 
+ cvs tag -b dev-developername-feature
+ 
+ That creates the branch, see above in 1.2 for the naming convention.
+ After that you NEED to do a
+ 
+ cvs update -r dev-developername-feature 
+ 
+ to get your local copy to recognize the branch. If not you would still
+ work in MAIN and thats not what you want.
+ 
+ Now, for the merge. Its simple. You need a checkout of the latest
+ Version of the MAIN revisions. In that directory you execute
+ 
+ cvs update -j dev-developername-feature
+ 
+ to merge your changes with MAIN. That tries to merge all your changes,
+ but maybe there is a conflict. You then need to resolv that conflict
+ before you commit the changes, of course. After you resolved all
+ conflicts its a simple
+ 
+ cvs commit
+ 
+ in the tree to commit your changes.
+ You should now do a
+ 
+ cvs tag dev-developername-feature-merge-with-main
+ 
+ to tag your branch at the time you merged. That way you can still work
+ on your branch and later merge it again, with only the changes you
+ added after the first merge. For that you modify the command above to
+ read as 
+ 
+ cvs update -j dev-developername-feature-merge-with-main -j 
dev-developername-feature
+ 
+ and cvs only considers the newly added code after the first merge. If
+ you dont tag the branch cvs considers all changes, including the
+ already merged ones - that gives a lot of conflicts to resolve.
  
  
  1.3 Muddleftpd Releases