Mercurial > octave

comparison etc/GNULIB.UPDATE @ 28173:e3ef089c5529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change instructructions for updating gnulib. * etc/GNULIB.UPDATE: Document steps to update gnulib to a newer version.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 25 Mar 2020 18:29:20 +0100
parents 873ef98668d1
children
comparison
equal deleted inserted replaced
28171:a23da76e0693 28173:e3ef089c5529
1 ## Instructions for updating gnulib on development branch 1 ## Instructions for updating gnulib on development branch
2 2
3 ## Change directory to the local Octave repositoy and clone the gnulib git 3 ## "cd" to a directory where you want to clone the gnulib repository and run:
4 ## repository: 4 git clone git://git.savannah.gnu.org/gnulib.git
5 git clone git://git.savannah.gnu.org/gnulib.git gnulib-git
6 5
7 ## Convert to hg (might take some time): 6 ## If you already have a local gnulib git repository, pull the latest changes:
8 hg --config extensions.convert= convert ./gnulib-git ./gnulib-hg 7 git pull
9 8
10 ## Change directory to the gnulib sub-repo in Octave and execute the following 9 ## Query the commit id of the current head:
11 ## commands: 10 git rev-parse HEAD
12 cd ./gnulib
13 hg pull default
14 hg update
15 hg log -rtip --template "{node}\n"
16 11
17 ## Take note of the SHA-1 hash (LAST_OLD_HASH) of that revision. 12 ## Locate the line in bootstrap.conf starting with ": ${GNULIB_REVISION=" and
18 13 ## replace the git commit id with the new one.
19 ## Locate the first new revision in the converted repository and replace it in
20 ## the following command:
21 cd ../gnulib-hg
22 hg log -r20111 --template "{node}\n"
23
24 ## Take note of the SHA-1 hash (FIRST_NEW_HASH) of that revision.
25
26 ## Change to the main directory of the local Octave repository and execute the
27 ## following command replacing the hashes with the information just gathered:
28 cd ..
29 echo FIRST_NEW_HASH LAST_OLD_HASH > splicemap
30
31 ## Execute the following command (having replaced FIRST_NEW_HASH):
32 hg --config extensions.convert= convert ./gnulib-hg ./gnulib --splicemap ./splicemap --config convert.hg.startrev=FIRST_NEW_HASH
33
34 ## In the Octave repository do the following:
35 cd gnulib
36 hg update
37 cd ..
38 hg commit -m "maint: update gnulib subrepo."
39 hg push default -r .