diff options
| author | Gregory Heytings <gregory@heytings.org> | 2022-12-18 10:46:48 +0000 |
|---|---|---|
| committer | Gregory Heytings <gregory@heytings.org> | 2022-12-18 11:48:58 +0100 |
| commit | c2375e77914f5b72abe1b43e554d36b045af1b06 (patch) | |
| tree | 65b011b10c0cfdd9fc87b06e54c269f7341d97d7 /admin/notes | |
| parent | 7cc2313eb0a765e4cfa8469b8db8dce4b207ae44 (diff) | |
| download | emacs-c2375e77914f5b72abe1b43e554d36b045af1b06.tar.gz emacs-c2375e77914f5b72abe1b43e554d36b045af1b06.tar.bz2 emacs-c2375e77914f5b72abe1b43e554d36b045af1b06.zip | |
Improve and extend admin/git-bisect-start
* admin/git-bisect-start: Use 'git bisect skip' instead of 'git
bisect good' for merges of external trees, which is equivalent but
faster in some cases. Improve the explanation on external tree
merges. Add list of commits in the last six years on which
building Emacs fails, and call 'git bisect skip' on them. Also
document how the script can be called automatically when 'git
bisect start' is called in the Emacs repository.
* admin/notes/repo (Bisecting): Adapt the explanation of the
script accordingly.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index 97f02ab6056..2be707db27f 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -129,8 +129,12 @@ This is a semi-automated way to find the revision that introduced a bug. Browse 'git help bisect' for technical instructions. It is recommended to start a bisection with the admin/git-bisect-start -script. This script prunes the branches that are the result of -merging external trees into the Emacs repository. +script. Using that script ensures that commits in branches that are +the result of merging external trees into the Emacs repository, as +well as certain commits on which Emacs fails to build, are skipped +during the bisection process. That script can also be executed +automatically when 'git bisect start' is called, with the help of a +wrapper script that is included in its commentary section. * Maintaining ChangeLog history |