4 |
|
|
5 |
1 - Anonymous CVS checkouts and updates (to be elaborated) |
1 - Anonymous CVS checkouts and updates (to be elaborated) |
6 |
2 - Committers/developers CVS access using SSH (to be written) |
2 - Committers/developers CVS access using SSH (to be written) |
7 |
3 - How to release lwIP |
3 - Merging from DEVEL branch to main trunk (stable branch) |
8 |
|
4 - How to release lwIP |
9 |
|
|
10 |
|
|
11 |
1 Anonymous CVS checkouts and updates |
1 Anonymous CVS checkouts and updates |
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 |
3 How to release lwIP |
|
30 |
|
3 Merging from DEVEL branch to main trunk (stable branch) |
31 |
|
--------------------------------------------------------- |
32 |
|
|
33 |
|
Merging from DEVEL to main requires that the DEVEL branch |
34 |
|
has a tag indicating the previous merger. This tag is |
35 |
|
called 'merged_from_DEVEL_to_main'. |
36 |
|
|
37 |
|
IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE |
38 |
|
REPOSITORY, THE TAG MUST BE SET ON THE SOURCE OF THE |
39 |
|
MERGE BRANCH (REPLACING EXISTING TAGS WITH THE SAME NAME). |
40 |
|
|
41 |
|
Merge all changes in DEVEL since our last merge to main: |
42 |
|
|
43 |
|
In the working copy of the main trunk: |
44 |
|
cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL |
45 |
|
|
46 |
|
Now move the tag in the DEVEL branch to this merge point, |
47 |
|
so we can use this for future merges. |
48 |
|
|
49 |
|
cvs -z4 rtag -F -r DEVEL merged_from_DEVEL_to_main lwip |
50 |
|
|
51 |
|
4 How to release lwIP |
52 |
--------------------- |
--------------------- |
53 |
|
|
54 |
First, checkout a clean copy of the branch to be released. Tag this set with |
First, checkout a clean copy of the branch to be released. Tag this set with |