kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

howto/maintain: document "### match next" convention in jch/pu branch 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2013-01-25 12:33:57 -08:00
parent ab05d7c736
commit e510f2d610
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/howto/maintain-git.txt
View File

@ -210,8 +210,8 @@ by doing the following:
The result is a script that lists topics to be merged in order to The result is a script that lists topics to be merged in order to
rebuild 'pu' as the input to Meta/Reintegrate script. Remove rebuild 'pu' as the input to Meta/Reintegrate script. Remove
later topics that should not be in 'jch' yet. Add a line that later topics that should not be in 'jch' yet. Add a line that
consists of '###' before the name of the first topic in the output consists of '### match next' before the name of the first topic
that should be in 'jch' but not in 'next' yet. in the output that should be in 'jch' but not in 'next' yet.


- Now we are ready to start merging topics to 'next'. For each - Now we are ready to start merging topics to 'next'. For each
branch whose tip is not merged to 'next', one of three things can branch whose tip is not merged to 'next', one of three things can
@ -233,7 +233,8 @@ by doing the following:
$ Meta/redo-jch.sh -c1 $ Meta/redo-jch.sh -c1


to rebuild the 'jch' branch from scratch. "-c1" tells the script to rebuild the 'jch' branch from scratch. "-c1" tells the script
to stop merging at the '###' line you added earlier. to stop merging at the first line that begins with '###'
(i.e. the "### match next" line you added earlier).


At this point, build-test the result. It may reveal semantic At this point, build-test the result. It may reveal semantic
conflicts (e.g. a topic renamed a variable, another added a new conflicts (e.g. a topic renamed a variable, another added a new
@ -261,8 +262,8 @@ by doing the following:
$ sh Meta/redo-jch.sh -u $ sh Meta/redo-jch.sh -u


This removes topics listed in the script that have already been This removes topics listed in the script that have already been
merged to 'master'. This unfortunately loses the "###" marker, merged to 'master'. This may lose '### match next' marker;
so add it again to the appropriate place. add it again to the appropriate place when it happens.


- Rebuild 'pu'. - Rebuild 'pu'.