[Muddleftpd-cvs] muddleftpd Developer.txt

[Joerg Jaspert]

CVSROOT:        /cvsroot/muddleftpd
Module name:    muddleftpd
Changes by:     Joerg Jaspert <address@hidden>  02/10/20 06:35:22

Modified files:
        .              : Developer.txt 

Log message:
        Added suggestions from Beau

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

Patches:
Index: muddleftpd/Developer.txt
diff -c muddleftpd/Developer.txt:1.1 muddleftpd/Developer.txt:1.2
*** muddleftpd/Developer.txt:1.1        Sat Oct 19 07:43:31 2002
--- muddleftpd/Developer.txt    Sun Oct 20 06:35:22 2002
***************
*** 21,27 ****
  file (you may change the comment style if needed):
  
  /* FILENAME SHORT DESCRIPTION OF THE FILE
! p
     Copyright (C) 1999 Beau Kuiper
  
     This program is free software; you can redistribute it and/or modify
--- 21,27 ----
  file (you may change the comment style if needed):
  
  /* FILENAME SHORT DESCRIPTION OF THE FILE
! 
     Copyright (C) 1999 Beau Kuiper
  
     This program is free software; you can redistribute it and/or modify
***************
*** 87,95 ****
     MAIN
     This tree is under full control of Beau Kuiper. If you want to
     change things here you have to get his OK first. That is to ensure
!    the quality and security of muddleftpd because every code added here
!    has to be fully reviewed. This tree will ever built a running
!    muddleftpd and everyone that commits here (after the OK) has to make
     sure HE DOESNT BREAK IT.
  
     release_*
--- 87,95 ----
     MAIN
     This tree is under full control of Beau Kuiper. If you want to
     change things here you have to get his OK first. That is to ensure
!    the quality and security of muddleftpd because all code added here
!    has to be fully reviewed. This tree will be branched to create new
!    releases and everyone that commits here (after the OK) has to make
     sure HE DOESNT BREAK IT.
  
     release_*
***************
*** 99,109 ****
     Such a branch is the place to fix bugs in a released version. See
     below for more about that.
  
!    everything_you_can_imagine
!    Every developer is allowed to create a branch with every name he
!    wants. (It should not include bad words :) ). He is then fully
!    responsible for that branch, so if you want to work on anothers
!    developers branch talk to him first.
     Developers can use that to work on new features/enhancements without
     breaking the MAIN tree of muddleftpd and without the rules that are
     for that tree.
--- 99,111 ----
     Such a branch is the place to fix bugs in a released version. See
     below for more about that.
  
!    dev_NICK_feature
!    Every developer is allowed to create a branch within the
!    repository. Just replace NICK with the nick you have on Savannah and
!    feature with the feature you want to develop in that branch. That
!    way everyone knows whats going on with a particular branch.
!    He is then fully responsible for that branch, so if you want to work
!    on anothers developers branch talk to him first.
     Developers can use that to work on new features/enhancements without
     breaking the MAIN tree of muddleftpd and without the rules that are
     for that tree.
***************
*** 117,123 ****
     merged into MAIN. Then you only commit things into that branch that
     are needed to get it accepted into MAIN, and after all things are
     sorted out you and Beau merge it into MAIN. Voila, a new feature is
!    there without one break of our MAIN line. :)
  
  If you ever create a branch and find out later that you dont need it,
  you can remove that branch from the repository. The project admins are
--- 119,125 ----
     merged into MAIN. Then you only commit things into that branch that
     are needed to get it accepted into MAIN, and after all things are
     sorted out you and Beau merge it into MAIN. Voila, a new feature is
!    there without breaking of our MAIN line. :)
  
  If you ever create a branch and find out later that you dont need it,
  you can remove that branch from the repository. The project admins are
***************
*** 140,146 ****
        Development
        Development of Muddleftpd is ongoing. The work is done in MAIN
        (see above) and in developer-created branches. You can add as
!       many new features you want (see notes for MAIN above).
  
        Frozen
        From time to time Joerg will create a new Branch in the CVS
--- 142,148 ----
        Development
        Development of Muddleftpd is ongoing. The work is done in MAIN
        (see above) and in developer-created branches. You can add as
!       many new features as you want (see notes for MAIN above).
  
        Frozen
        From time to time Joerg will create a new Branch in the CVS
***************
*** 194,208 ****
  on Savannah, and also announce it on the mailing list (do not send the
  patch to the list, just send a short announcement). You must NOT submit
  the entire changed file, nor just the changed lines of code. If you
! submit something other than a patch, you will be asked politely to
! resubmit your changes as a patch, and your code will not be merged until
! you do.
  
  Note: If your patch is around twice the size of the file you're
  patching, something went wrong. DO NOT submit that patch. If you edited
  the file on a non-unix system, and transferred it to a unix system to
  run diff on it, you need to make sure the end-of-line characters are the
  unix kind. Ask on the mailing list if you have this problem.
  
  
  1.6 How to become a developer
--- 196,230 ----
  on Savannah, and also announce it on the mailing list (do not send the
  patch to the list, just send a short announcement). You must NOT submit
  the entire changed file, nor just the changed lines of code. If you
! submit something other than a patch created using the instructions
! below, you will be asked politely to resubmit your changes as a patch.
! Your code will not be merged until you do.
  
  Note: If your patch is around twice the size of the file you're
  patching, something went wrong. DO NOT submit that patch. If you edited
  the file on a non-unix system, and transferred it to a unix system to
  run diff on it, you need to make sure the end-of-line characters are the
  unix kind. Ask on the mailing list if you have this problem.
+ 
+ Example:
+ To create a unified patch suitable for submission, have both your modified 
+ source tree and the original source tree avaliable. Prepare both trees for 
+ comparison by running the following (on both trees):
+ 
+ bash$ ./configure
+ bash$ make maintainer-clean
+ 
+ Now compare the two trees using the following command:
+ 
+ bash$ diff -r -u3 [path to original tree] [path to modified tree] > patchfile
+ 
+ Patchfile will now contain your patch and you can submit it. Be sure that 
+ you don't mix the original and modified tree paths up, otherwise your patch 
+ will end up backwards.
+ 
+ Note: if you need to use your tree again after creating the patch, simply run 
+ ./autogen.sh in the source tree. This will automaticly regenerate all the 
+ configure scripts.
  
  
  1.6 How to become a developer