/[lwip]/lwip/doc/savannah.txt
ViewVC logotype

Diff of /lwip/doc/savannah.txt

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

revision 1.1.2.3 by likewise, Sun Jul 20 11:48:24 2003 UTC revision 1.1.2.4 by likewise, Thu Sep 25 22:42:23 2003 UTC
# Line 11  Table of Contents: Line 11  Table of Contents:
11  1 Anonymous CVS checkouts and updates  1 Anonymous CVS checkouts and updates
12  -------------------------------------  -------------------------------------
13    
14  Obtain lwIP from the STABLE tree (on the CVS main trunk)  Obtain lwIP from the CVS main trunk (stable)
15    
16  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
17  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout lwip  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout lwip
# Line 24  cvs -d:pserver:anoncvs@subversions.gnu.o Line 24  cvs -d:pserver:anoncvs@subversions.gnu.o
24  Or, obtain a development branch as follows:  Or, obtain a development branch as follows:
25    
26  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
27  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r DEVEL -d lwip-devel lwip  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r DEVEL -d lwip-DEVEL lwip
28    
29    
30  3 Merging from DEVEL branch to main trunk (stable branch)  3 Merging from DEVEL branch to main trunk (stable)
31  ---------------------------------------------------------  ---------------------------------------------------------
32    
33  Merging from DEVEL to main requires that the DEVEL branch  Merging is a delicate process in CVS and requires the
34  has a tag indicating the previous merger. This tag is  following disciplined manual in order to prevent future conflicts.
35  called 'merged_from_DEVEL_to_main'.  
36    Merging from branch A to branch B requires that the A branch
37    has a tag indicating the previous merger. This tag is called
38    'merged_from_A_to_B'. After merging the tag is overwritten in
39    the A branch to remember this merger for future merge actions.
40    
41  IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE  IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
42  REPOSITORY, THE TAG MUST BE SET ON THE SOURCE OF THE  REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE
43  MERGE BRANCH (REPLACING EXISTING TAGS WITH THE SAME NAME).  MERGE ACTION (REPLACING EXISTING TAGS WITH THE SAME NAME).
44    
45  Merge all changes in DEVEL since our last merge to main:  Merge all changes in DEVEL since our last merge to main:
46    
47  In the working copy of the main trunk:  In the working copy of the main trunk:
48  cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL  cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL
49    
50  Now move the tag in the DEVEL branch to this merge point,  (This will apply the changes between 'merged_from_DEVEL_to_main'
51  so we can use this for future merges.  and 'DEVEL' to your work set of files)
52    
53    If this worked out OK, we now move the tag in the DEVEL branch
54    to this merge point, so we can use this point for future merges:
55    
56  cvs -z4 rtag -F -r DEVEL merged_from_DEVEL_to_main lwip  cvs rtag -F -r DEVEL merged_from_DEVEL_to_main lwip
57    
58  4 How to release lwIP  4 How to release lwIP
59  ---------------------  ---------------------
# Line 61  is not created locally. Line 68  is not created locally.
68  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
69  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip export -r STABLE-0_6_3 -d lwip-0.6.3 lwip  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip export -r STABLE-0_6_3 -d lwip-0.6.3 lwip
70    
71  Archive this directory using tar.  Archive this directory using tar, gzip'd, bzip2'd and zip'd.
72    
73  tar czvf lwip-0.6.3.tar.gz lwip-0.6.3  tar czvf lwip-0.6.3.tar.gz lwip-0.6.3
74    

Legend:
Removed from v.1.1.2.3  
changed lines
  Added in v.1.1.2.4

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