howto/maintain: document "### match next" convention in jch/pu branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 25, 2013 at 12:33 UTC
e510f2d610b30013675c9b08bae92a9cfc4b5907
1 file changed
+6
-5
Documentation/howto/maintain-git.txt
+6
-5
@@ -210,8 +210,8 @@ by doing the following:
210
The result is a script that lists topics to be merged in order to
211
rebuild 'pu' as the input to Meta/Reintegrate script. Remove
212
later topics that should not be in 'jch' yet. Add a line that
213
- consists of '###' before the name of the first topic in the output
214
- that should be in 'jch' but not in 'next' yet.
213
+ consists of '### match next' before the name of the first topic
214
+ in the output that should be in 'jch' but not in 'next' yet.
215
216
- Now we are ready to start merging topics to 'next'. For each
217
branch whose tip is not merged to 'next', one of three things can
@@ -233,7 +233,8 @@ by doing the following:
233
$ Meta/redo-jch.sh -c1
234
235
to rebuild the 'jch' branch from scratch. "-c1" tells the script
236
- to stop merging at the '###' line you added earlier.
236
+ to stop merging at the first line that begins with '###'
237
+ (i.e. the "### match next" line you added earlier).
238
239
At this point, build-test the result. It may reveal semantic
240
conflicts (e.g. a topic renamed a variable, another added a new
@@ -261,8 +262,8 @@ by doing the following:
262
$ sh Meta/redo-jch.sh -u
263
264
This removes topics listed in the script that have already been
264
- merged to 'master'. This unfortunately loses the "###" marker,
265
- so add it again to the appropriate place.
265
+ merged to 'master'. This may lose '### match next' marker;
266
+ add it again to the appropriate place when it happens.
267
268
- Rebuild 'pu'.
269