Skip to content

Commit 7fa56b1

Browse files
committed
Documentation: build redo-jch.sh from master..jch
Rebuilding the 'jch' branch begins by reintegrating any topics between 'master' and 'jch', not 'master' and 'seen'. In the maintainer guide, the documentation isn't quite right, since the initial input to Meta/Reintegrate is "master..seen", not "master..jch". This can lead to confusing results when generating the Meta/redo-jch.sh script for the first time. Additionally, rebuilding 'jch' takes place in two steps. First, running the script up to the first "### match next" cut-line, and then comparing the result with what's on 'next' (i.e. with "git diff jch next"). Then, the remaining set of topics get merged down to 'jch' (which aren't on 'next') by running the entire "redo-jch.sh" script. Clarify the documentation to reflect this. Signed-off-by: Taylor Blau <[email protected]>
1 parent 6c3b077 commit 7fa56b1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ by doing the following:
231231
- Prepare 'jch' branch, which is used to represent somewhere
232232
between 'master' and 'seen' and often is slightly ahead of 'next'.
233233

234-
$ Meta/Reintegrate master..seen >Meta/redo-jch.sh
234+
$ Meta/Reintegrate master..jch >Meta/redo-jch.sh
235235

236236
The result is a script that lists topics to be merged in order to
237237
rebuild 'seen' as the input to Meta/Reintegrate script. Remove
@@ -283,6 +283,11 @@ by doing the following:
283283

284284
$ git diff jch next
285285

286+
Then build the rest of 'jch':
287+
288+
$ git checkout jch
289+
$ sh Meta/redo-jch.sh
290+
286291
When all is well, clean up the redo-jch.sh script with
287292

288293
$ sh Meta/redo-jch.sh -u

0 commit comments

Comments
 (0)