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

Clearified exact merge steps.

Browse Source
This commit is contained in:
likewise 2003-11-14 13:00:08 +00:00
parent 3e1f7bd2fc
commit de7aab7bc8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/savannah.txt
View File

@ -31,12 +31,13 @@ cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r DEVEL -d lw
--------------------------------------------------------- ---------------------------------------------------------
Merging is a delicate process in CVS and requires the Merging is a delicate process in CVS and requires the
following disciplined manual in order to prevent future conflicts. following disciplined steps in order to prevent conflicts
in the future. Conflicts can be hard to solve!
Merging from branch A to branch B requires that the A branch Merging from branch A to branch B requires that the A branch
has a tag indicating the previous merger. This tag is called has a tag indicating the previous merger. This tag is called
'merged_from_A_to_B'. After merging the tag is overwritten in 'merged_from_A_to_B'. After merging, the tag is moved in the
the A branch to remember this merger for future merge actions. A branch to remember this merger for future merge actions.
IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE