abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-12-10 08:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated CHANGELOG to reflect recent changes. Clearified docs on merging.

Browse Source
This commit is contained in:
likewise 2003-09-25 22:42:22 +00:00
parent f62288c744
commit 73a095572e
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG
View File

@ -4,6 +4,9 @@ HISTORY
++ Bug fixes:
* Fixed TCP bug induced by bad window resizing with unidirectional TCP traffic.
* unaligned 16-bit access in checksum routine fixed.
* packets sent from ARP queue had invalid source hardware address.
* some debug formatters and casts fixed.
* numerous fixes in PPP.
@ -11,7 +14,12 @@ HISTORY
* DEBUGF now is LWIP_DEBUGF
* pbuf_dechain() has been re-enabled.
* Mentioned the changed use of CVS branches in README.
* Mentioned the use of CVS branches in README.
++ New features:
* no longer dependent on ctype.h
* raw IP mode
(STABLE-0_6_3)

31
doc/savannah.txt
View File

@ -11,7 +11,7 @@ Table of Contents:
1 Anonymous CVS checkouts and updates
-------------------------------------
Obtain lwIP from the STABLE tree (on the CVS main trunk)
Obtain lwIP from the CVS main trunk (stable)
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout lwip
@ -24,29 +24,36 @@ cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r STABLE-0_6_
Or, obtain a development branch as follows:
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
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
3 Merging from DEVEL branch to main trunk (stable branch)
3 Merging from DEVEL branch to main trunk (stable)
---------------------------------------------------------
Merging from DEVEL to main requires that the DEVEL branch
has a tag indicating the previous merger. This tag is
called 'merged_from_DEVEL_to_main'.
Merging is a delicate process in CVS and requires the
following disciplined manual in order to prevent future conflicts.
Merging from branch A to branch B requires that the A branch
has a tag indicating the previous merger. This tag is called
'merged_from_A_to_B'. After merging the tag is overwritten in
the A branch to remember this merger for future merge actions.
IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
REPOSITORY, THE TAG MUST BE SET ON THE SOURCE OF THE
MERGE BRANCH (REPLACING EXISTING TAGS WITH THE SAME NAME).
REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE
MERGE ACTION (REPLACING EXISTING TAGS WITH THE SAME NAME).
Merge all changes in DEVEL since our last merge to main:
In the working copy of the main trunk:
cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL
Now move the tag in the DEVEL branch to this merge point,
so we can use this for future merges.
(This will apply the changes between 'merged_from_DEVEL_to_main'
and 'DEVEL' to your work set of files)
cvs -z4 rtag -F -r DEVEL merged_from_DEVEL_to_main lwip
If this worked out OK, we now move the tag in the DEVEL branch
to this merge point, so we can use this point for future merges:
cvs rtag -F -r DEVEL merged_from_DEVEL_to_main lwip
4 How to release lwIP
---------------------
@ -61,7 +68,7 @@ is not created locally.
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip export -r STABLE-0_6_3 -d lwip-0.6.3 lwip
Archive this directory using tar.
Archive this directory using tar, gzip'd, bzip2'd and zip'd.
tar czvf lwip-0.6.3.tar.gz lwip-0.6.3